Commit fbd59ac7 authored by Naomi Guyer's avatar Naomi Guyer Committed by Aaron Wells
Browse files

Dashboard and fontawesome (bootstrap)

Bug 1465107: Use Bootstrap CSS Framework
Dashboard and font awesome
Icon upgrade (bootstrap)

Change-Id: I76485618a595e0c4dc5269922d8f5ac94a30c2ae
parent 0d5637a6
......@@ -49,11 +49,12 @@ $closeform = pieform(array(
'elements' => array(
'close' => array(
'type' => 'hidden',
'value' => !$closed,
'value' => !$closed
),
'submit' => array(
'type' => 'submit',
'value' => get_string($closed ? 'Open' : 'Close', 'admin'),
'class' => $closed ? 'btn btn-success' : 'btn btn-danger'
),
),
));
......
......@@ -15,6 +15,7 @@ define('MENUITEM', 'adminhome/registersite');
define('SECTION_PLUGINTYPE', 'core');
define('SECTION_PLUGINNAME', 'admin');
require(dirname(dirname(__FILE__)).'/init.php');
require_once('pieforms/pieform.php');
......@@ -27,8 +28,11 @@ if (!get_config('registration_lastsent')) {
$smarty = smarty();
if (isset($register)) {
$smarty->assign('register', $register);
}
$smarty->assign('PAGEICON', 'fa fa-star');
$smarty->display('admin/registersite.tpl');
......@@ -67,6 +67,7 @@ EOF;
$smarty = smarty(array('paginator'));
$smarty->assign('PAGEHEADING', TITLE);
$smarty->assign('PAGEICON', 'fa fa-area-chart');
$smarty->assign('INLINEJAVASCRIPT', $js);
$smarty->assign('sitedata', $sitedata);
......
......@@ -494,7 +494,7 @@ function FileBrowser(idprefix, folderid, config, globalconfig) {
return false;
}
});
ul.append($j('<li><span class="glyphicon glyphicon-share-alt prm"></span>').append(link));
ul.append($j('<li><span class="fa fa-share-alt prm"></span>').append(link));
}
else {
movefoldercount --;
......@@ -516,7 +516,7 @@ function FileBrowser(idprefix, folderid, config, globalconfig) {
self.move_list = null;
}
});
ul.append($j('<li><span class="glyphicon glyphicon-remove-circle prm"></span>').append(cancellink));
ul.append($j('<li><span class="fa fa-remove-circle prm"></span>').append(cancellink));
self.move_list = ul;
return ul;
......
......@@ -259,7 +259,7 @@ $string['profileiconsize'] = 'Profile picture size';
$string['profileicons'] = 'Profile pictures';
$string['Default'] = 'Default';
$string['defaultprofileicon'] = 'This is currently set as your default profile picture.';
$string['deleteselectedicons'] = 'Delete selected profile pictures';
$string['deleteselectedicons'] = 'Delete';
$string['editprofileicon'] = 'Edit profile picture';
$string['profileicon'] = 'Profile picture';
$string['noimagesfound'] = 'No images found';
......
......@@ -580,7 +580,7 @@ function contextualHelp(formName, helpName, pluginType, pluginName, page, sectio
*/
function buildContextualHelpBox(content) {
var result = '<div class="pull-right pts">';
result += '<a href="" class="help-dismiss" onclick="return false;"><span class="glyphicon glyphicon-remove"></span></a>';
result += '<a href="" class="help-dismiss" onclick="return false;"><span class="fa fa-remove"></span></a>';
result += '</div>';
result += '<div id="helpstop">';
result += content;
......
......@@ -24,18 +24,21 @@ function register_site() {
$strfield = get_string('Field', 'admin');
$strvalue = get_string('Value', 'admin');
$info = <<<EOF
<tr><td>
<table>
<table class="table table-striped table-bordered" id="register-table">
<thead>
<tr>
<th>$strfield</th>
<th>$strvalue</th>
</tr>
</thead>
<tbody>
EOF;
$data = registration_data();
foreach($data as $key => $val) {
$info .= '<tr><td>'. hsc($key) . '</td><td>' . hsc($val) . "</td></tr>\n";
$info .= '<tr><th>'. hsc($key) . '</th><td>' . hsc($val) . "</td></tr>\n";
}
$info .= '</table></td></tr>';
$info .= '</tbody></table>';
$form = array(
'name' => 'register',
......@@ -44,8 +47,7 @@ EOF;
'whatsent' => array(
'type' => 'fieldset',
'legend' => get_string('datathatwillbesent', 'admin'),
'collapsible' => true,
'collapsed' => true,
'class' => "collapse",
'elements' => array(
'info' => array(
'type' => 'markup',
......@@ -60,6 +62,7 @@ EOF;
),
'register' => array(
'type' => 'submit',
'class' => 'btn btn-success',
'value' => get_string('Register', 'admin'),
),
)
......
......@@ -2082,7 +2082,11 @@ function get_help_icon($plugintype, $pluginname, $form, $element, $page='', $sec
json_encode($pluginname) . ',' . json_encode($page) . ',' .
json_encode($section)
. ',this); return false;'
<<<<<<< HEAD
) . '"><span class="glyphicon glyphicon-info-sign"></span><span class="sr-only">Help</span></a></span>';
=======
) . '"><span class="fa fa-info-circle"></span><span class="sr-only">'. get_string('Help') . '</span></a></span>';
>>>>>>> Dashboard and fontawesome (bootstrap)
}
function pieform_get_help(Pieform $form, $element) {
......
......@@ -22,7 +22,7 @@
<form name="edit_{$post->id}" action="{$WWWROOT}artefact/blog/post.php">
<input type="hidden" name="id" value="{$post->id}">
<button type="submit" class="btn btn-default btn-xs">
<span class="glyphicon glyphicon-pencil"></span>
<span class="fa fa-pencil"></span>
<span class="sr-only">{str(tag=editspecific arg1=$post->title)|escape:html|safe}</span>
</button>
</form>
......@@ -48,10 +48,11 @@
</span>
<a class="attach-files" data-toggle="collapse" href="#attach_{$post->id}" aria-expanded="false">
{str tag=attachedfiles section=artefact.blog}
<span class="glyphicon glyphicon-chevron-down"></span>
<span class="fa fa-chevron-down"></span>
</a>
</div>
<div class="collapse files" id="attach_{$post->id}">
{foreach from=$post->files item=file}
<div class="attached-file {cycle values='r1,r0'}">
<h3 class="title">
......
......@@ -87,11 +87,11 @@
{assign var=deletetext value=str(tag=deletespecific arg1=$displaytitle)}
{/if}
<button name="{$prefix}_edit[{$file->id}]" class="btn btn-default btn-xs">
<span class="glyphicon glyphicon-pencil"></span>
<span class="fa fa-pencil"></span>
<span class="sr-only">{$edittext|escape:html|safe}</span>
</button>
<button name="{$prefix}_delete[{$file->id}]" class="btn btn-danger btn-xs">
<span class="glyphicon glyphicon-trash"></span>
<span class="fa fa-trash"></span>
<span class="sr-only">{$deletetext|escape:html|safe}</span>
</button>
{/if}
......
......@@ -14,7 +14,15 @@
</tbody>
<tfoot>
<tr>
<td colspan="4" class="text-right"><input id="settings_default" class="submit btn btn-success" type="submit" name="default" value="{str tag="setdefault" section=artefact.file}"> <input id="settings_delete" type="submit" class="delete btn btn-danger" name="delete" value="{str tag="deleteselectedicons" section=artefact.file}"></td>
<td colspan="4" class="text-right">
<span class="fa fa-ok prs"></span>
{str tag="setdefault" section=artefact.file}
</button>
<button id="settings_delete" type="submit" class="delete btn btn-danger" name="delete">
<span class="fa fa-trash prs"></span>
{str tag="deleteselectedicons" section=artefact.file}
</button>
</td>
</tr>
</tfoot>
</table>
......
......@@ -8,7 +8,7 @@
<th>{str tag=currenttitle section=artefact.internal}</th>
<th>{str tag=containedin section=artefact.internal}</th>
<th class="text-center">
<span class="glyphicon glyphicon-paperclip"></span>
<span class="fa fa-paperclip"></span>
<span class="sr-only">{str tag=Attachments section=artefact.resume}</span>
</th>
<th><span class="accessible-hidden sr-only">{str tag=edit}</span></th>
......@@ -83,7 +83,7 @@
<span class="s dull">{str tag=Submitted section=view}</span>
{else}
<a href="{$WWWROOT}artefact/internal/editnote.php?id={$n->id}" title="{str tag=edit}">
<span class="glyphicon glyphicon-pencil"></span>
<span class="fa fa-pencil"></span>
<span class="sr-only">{str(tag=editspecific arg1=$n->title)|escape:html|safe}</span>
</a>
{if $n->deleteform}{$n->deleteform|safe}{/if}
......
......@@ -22,12 +22,12 @@
<td>{if $row->link}<a href="{$row->link}" title="{$row->link}" target="_blank" class="socialprofile">{/if}{$row->title}{if $row->link}</a>{/if}</td>
{if $controls}<td class="right buttonscell btns2">
<a href="{$WWWROOT}artefact/internal/socialprofile.php?id={$row->id}" title="{str tag='edit'}" class="btn btn-default btn-xs">
<span class="glyphicon glyphicon-pencil"></span>
<span class="fa fa-pencil"></span>
<span class="sr-only">{str tag='edit'}</span>
</a>
{if $candelete}
<a href="{$WWWROOT}artefact/internal/socialprofile.php?id={$row->id}&delete=1" title="{str tag='delete'}" class="btn btn-danger btn-xs">
<span class="glyphicon glyphicon-trash"></span>
<span class="fa fa-trash"></span>
<span class="sr-only">{str tag='delete'}</span>
</a>
{/if}
......
......@@ -84,7 +84,7 @@
<td>{$item->date}</td>
<td class="text-center">
{if $item->read}
<span class="glyphicon glyphicon-ok"></span>
<span class="fa fa-ok"></span>
<span class="sr-only">{str tag=read section=activity}</span>
{else}
<label class="accessible-hidden sr-only" for="unread-{$item->table}-{$item->id}">{str tag='markasread' section='activity'}</label>
......
......@@ -4,15 +4,15 @@
<div class="pull-right planstatus">
<a href="{$WWWROOT}artefact/plans/edit/index.php?id={$plan->id}" title="{str tag=edit}" class="btn btn-default btn-xs">
<span class="glyphicon glyphicon-pencil"></span>
<span class="fa fa-pencil"></span>
<span class="sr-only">{str(tag=editspecific arg1=$plan->title)|escape:html|safe}</span>
</a>
<a href="{$WWWROOT}artefact/plans/plan.php?id={$plan->id}" title="{str tag=managetasks section=artefact.plans}" class="btn btn-default btn-xs">
<span class="glyphicon glyphicon-cog"></span>
<span class="fa fa-cog"></span>
<span class="sr-only">{str(tag=managetasksspecific section=artefact.plans arg1=$plan->title)|escape:html|safe}</span>
</a>
<a href="{$WWWROOT}artefact/plans/delete/index.php?id={$plan->id}" title="{str tag=delete}" class="btn btn-danger btn-xs">
<span class="glyphicon glyphicon-trash"></span>
<span class="fa fa-trash"></span>
<span class="sr-only">{str(tag=deletespecific arg1=$plan->title)|escape:html|safe}</span>
</a>
</div>
......
......@@ -9,7 +9,7 @@
<tr>
<th>{str tag='goals' section='artefact.resume'}</th>
<th class="resumeattachments text-center">
<span class="glyphicon glyphicon-paperclip">
<span class="fa fa-paperclip">
<span class="sr-only">{str tag=Attachments section=artefact.resume}</span>
</th>
<th><span class="accessible-hidden sr-only">{str tag=edit}</span></th>
......@@ -50,12 +50,12 @@
<td class="right buttonscell btns2">
{if $n->exists}
<a id="goals_edit_{$n->artefacttype}" href="{$WWWROOT}artefact/resume/editgoalsandskills.php?id={$n->id}" title="{str tag=edit$n->artefacttype section=artefact.resume}" class="btn btn-default btn-xs">
<span class="glyphicon glyphicon-pencil"></span>
<span class="fa fa-pencil"></span>
<span class="sr-only">{str tag=edit}</span>
</a>
{else}
<a id="goals_edit_{$n->artefacttype}" href="{$WWWROOT}artefact/resume/editgoalsandskills.php?type={$n->artefacttype}" title="{str tag=edit$n->artefacttype section=artefact.resume}" class="btn btn-default btn-xs">
<span class="glyphicon glyphicon-pencil"></span>
<span class="fa fa-pencil"></span>
<span class="sr-only">{str tag=edit}</span>
</a>
{/if}
......
......@@ -9,7 +9,7 @@
<tr>
<th>{str tag='skills' section='artefact.resume'}</th>
<th class="resumeattachments text-center">
<span class="glyphicon glyphicon-paperclip"></span>
<span class="fa fa-paperclip"></span>
<span class="sr-only">{str tag=Attachments section=artefact.resume}</span>
</th>
<th><span class="accessible-hidden sr-only">{str tag=edit}</span></th>
......@@ -50,12 +50,12 @@
<td class="right buttonscell btns2">
{if $n->exists}
<a id="skills_edit_{$n->artefacttype}" href="{$WWWROOT}artefact/resume/editgoalsandskills.php?id={$n->id}" title="{str tag=edit$n->artefacttype section=artefact.resume}" class="btn btn-default btn-xs">
<span class="glyphicon glyphicon-pencil"></span>
<span class="fa fa-pencil"></span>
<span class="sr-only">{str tag=edit}</span>
</a>
{else}
<a id="skills_edit_{$n->artefacttype}" href="{$WWWROOT}artefact/resume/editgoalsandskills.php?type={$n->artefacttype}" title="{str tag=edit$n->artefacttype section=artefact.resume}" class="btn btn-default btn-xs">
<span class="glyphicon glyphicon-pencil"></span>
<span class="fa fa-pencil"></span>
<span class="sr-only">{str tag=edit}</span>
</a>
{/if}
......
<div class="admin-warning-box">
<div class="admin-warning alert alert-warning">
{if $header}<h3>{$header}</h3>{/if}
<p>{$notice|safe}</p>
</div>
\ No newline at end of file
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