Commit c55e73aa authored by Pat Kira's avatar Pat Kira Committed by Aaron Wells
Browse files

Dashboard (bootstrap)

Bug 1465107: Use Bootstrap CSS Framework
Dashboard widgets styling
Style dashboard and user's setting

Change-Id: I2ca8f561117daa7d4e6b1fd6b163a2a6421751c5
parent 3edfb01d
......@@ -4,6 +4,7 @@
$mahara-green: #335804;
$mahara-green-light: #5C8727;
$mahara-green-lime: #B9CB2E;
$mahara-blue: #1e6297;
$mahara-dark-grey: #211c00;
$mahara-blue: #5486BC;
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -12,7 +12,7 @@
{$deleteall|safe}
<form name="notificationlist" method="post" onSubmit="markread(this, 'read'); return false;">
<table id="activitylist" class="fullwidth">
<table id="activitylist" class="fullwidth table table-striped">
<thead>
<tr>
<th><span class="accessible-hidden sr-only">{str section='activity' tag='messagetype'}</span></th>
......@@ -39,7 +39,7 @@
</table>
<div class="right activity-buttons">
<input class="submit btn btn-success" type="submit" value="{str tag='markasread' section='activity'}" />
<input class="submit btn-del" type="button" value="{str tag='delete'}" onClick="markread(document.notificationlist, 'del'); return false;" />
<input class="submit btn btn-danger" type="button" value="{str tag='delete'}" onClick="markread(document.notificationlist, 'del'); return false;" />
</div>
{$activitylist.pagination|safe}
</form>
......
{include file="header.tpl"}
{$searchform|safe}
<table id="admgroupslist" class="fullwidth">
<thead>
<tr>
<th>{str tag="groupname" section="admin"}</th>
<th class="center">{str tag="groupmembers" section="admin"}</th>
<table id="admgroupslist" class="fullwidth table table-striped">
<thead>
<tr>
<th>{str tag="groupname" section="admin"}</th>
<th class="center">{str tag="groupmembers" section="admin"}</th>
<th class="center">{str tag="groupadmins" section="admin"}</th>
<th>{str tag="grouptype" section="admin"}</th>
<th>{str tag="grouptype" section="admin"}</th>
{if get_config('allowgroupcategories')}
<th>{str tag="groupcategory" section="group"}</th>
{/if}
<th>{str tag="groupvisible" section="admin"}</th>
<th>{str tag="groupvisible" section="admin"}</th>
<th><span class="accessible-hidden sr-only">{str tag=edit}</span></th>
</tr>
</thead>
<tbody>
{$results.tablerows|safe}
</tbody>
</table>
</tr>
</thead>
<tbody>
{$results.tablerows|safe}
</tbody>
</table>
{$results.pagination|safe}
{include file="footer.tpl"}
......@@ -9,7 +9,7 @@
<div class="errmsg">{$e}</div>
{/foreach}
{/if}
<table class="fullwidth">
<table class="fullwidth table table-striped">
<thead>
<tr>
<th>{str tag=licenseiconlabel section=admin}</th>
......@@ -27,8 +27,9 @@
<td>{$l->shortname}</td>
<td><a href="{$l->name}">{$l->name}</a></td>
<td class="btns2">
<a href="license-edit.php?edit={$l->name|escape:url}" title="{str tag=edit}">
<img src="{$THEME->get_url('images/btn_edit.png')}" alt="{str(tag=editspecific arg1=$l->shortname)|escape:html|safe}">
<a href="license-edit.php?edit={$l->name|escape:url}" title="{str tag=edit}" class="btn btn-default btn-xs">
<span class="glyphicon glyphicon-pencil"></span>
<span class="sr-only">{str(tag=editspecific arg1=$l->shortname)|escape:html|safe}</span>
</a>
<input type="image" title="{str tag=delete}" value="" name="license_delete[{$l->name}]" src="{$THEME->get_url('images/btn_deleteremove.png')}" alt="{str(tag=deletespecific arg1=$l->shortname)|escape:html|safe}">
</td>
......
......@@ -32,45 +32,47 @@
{$institution_form|safe}
{else}
{$searchform|safe}
<table id="adminstitutionslist" class="fullwidth">
<thead>
<tr>
<th>{str tag="institution"}</th>
<th class="center">{str tag="Members" section="admin"}</th>
<th class="center">{str tag="Maximum" section="admin"}</th>
<th class="center">{str tag="Staff" section="admin"}</th>
<th class="center">{str tag="Admins" section="admin"}</th>
<th></th>
<th><span class="accessible-hidden sr-only">{str tag=edit}</span></th>
</tr>
</thead>
<tfoot>
<tr>
<td>
{if $siteadmin}
<form action="" method="post">
<input class="submit btn btn-success" type="submit" name="add" value="{str tag="addinstitution" section="admin"}" id="admininstitution_add">
</form>
{/if}
</td>
<td colspan="6" class="institutionedituserbuttons right">{if $countinstitutions > 1}
<form action="{$WWWROOT}admin/users/institutionusers.php" method="post">
<input class="submit btn btn-success" type="submit" name="editmembers" value="{str tag="editmembers" section="admin"}">
</form>
<form action="{$WWWROOT}admin/users/institutionstaff.php" method="post">
<input class="submit btn btn-success" type="submit" name="editstaff" value="{str tag="editstaff" section="admin"}">
</form>
<form action="{$WWWROOT}admin/users/institutionadmins.php" method="post">
<input class="submit btn btn-success" type="submit" name="editadmins" value="{str tag="editadmins" section="admin"}">
</form>
{/if}</td>
<td></td>
</tr>
</tfoot>
<tbody>
{$results.tablerows|safe}
</tbody>
</table>
<div class="table-responsive">
<table id="adminstitutionslist" class="fullwidth table table-striped">
<thead>
<tr>
<th>{str tag="institution"}</th>
<th class="center">{str tag="Members" section="admin"}</th>
<th class="center">{str tag="Maximum" section="admin"}</th>
<th class="center">{str tag="Staff" section="admin"}</th>
<th class="center">{str tag="Admins" section="admin"}</th>
<th></th>
<th><span class="accessible-hidden sr-only">{str tag=edit}</span></th>
</tr>
</thead>
<tfoot>
<tr>
<td>
{if $siteadmin}
<form action="" method="post">
<input class="submit btn btn-success" type="submit" name="add" value="{str tag="addinstitution" section="admin"}" id="admininstitution_add">
</form>
{/if}
</td>
<td colspan="6" class="institutionedituserbuttons right">{if $countinstitutions > 1}
<form action="{$WWWROOT}admin/users/institutionusers.php" method="post">
<input class="submit btn btn-success" type="submit" name="editmembers" value="{str tag="editmembers" section="admin"}">
</form>
<form action="{$WWWROOT}admin/users/institutionstaff.php" method="post">
<input class="submit btn btn-success" type="submit" name="editstaff" value="{str tag="editstaff" section="admin"}">
</form>
<form action="{$WWWROOT}admin/users/institutionadmins.php" method="post">
<input class="submit btn btn-success" type="submit" name="editadmins" value="{str tag="editadmins" section="admin"}">
</form>
{/if}</td>
<td></td>
</tr>
</tfoot>
<tbody>
{$results.tablerows|safe}
</tbody>
</table>
</div>
<div class="center">
{$results.pagination|safe}
</div>
......
......@@ -3,7 +3,7 @@
<h2>{$PAGESUBHEADING}</h2>
{/if}
{if $canedit}
<div class="pull-right {if $GROUP}pagetabs{/if}">
<div class="text-right {if $GROUP}pagetabs{/if}">
<a class="btn btn-success" href="{$WWWROOT}collection/edit.php?new=1{$urlparamsstr}">{str section=collection tag=newcollection}</a>
<a class="btn btn-success" href="{$WWWROOT}view/choosetemplate.php?searchcollection=1{$urlparamsstr}">{str section=collection tag=copyacollection}</a>
</div>
......
{include file="header.tpl"}
{if $cancreate}
<div class="pull-right">
<div class="text-right pg-button">
<a href="{$WWWROOT}group/edit.php" class="btn btn-success creategroup">{str tag="creategroup" section="group"}</a>
</div>
{/if}
......
......@@ -30,7 +30,6 @@
<div id="loading-box" class="loading-box"></div>
<header class="header navbar navbar-default navbar-fixed-top">
<!-- <header class="header navbar navbar-default"> -->
<div class="container">
{if $MAINNAV}
<!-- Brand and toggle get grouped for better mobile display -->
......@@ -69,6 +68,7 @@
<div id="content" class="main-column{if $selected == 'content'} editcontent{/if}">
<div id="main-column-container">
{dynamic}{insert_messages}{/dynamic}
{if isset($PAGEHEADING)}
<h1>{$PAGEHEADING}{if $PAGEHELPNAME}<span class="page-help-icon">{$PAGEHELPICON|safe}</span>{/if}</h1>
......
<div id="home-info-container">
<div id="home-info-container" class="dashboard-widget-container">
{if $USER->is_logged_in()}
<div id="hideinfo" class="nojs-hidden-block">
<a href="#" title="{str tag=Hide2}">
<img src="{theme_url filename='images/btn_close.png'}" alt="{str tag=Close}" />
<div id="hideinfo" class="nojs-hidden-block align-right">
<a href="#" title="{str tag=Hide2}" class="remove-widgets">
<span class="glyphicon glyphicon-remove-circle"></span>
<span class="sr-only">{str tag=Close}</span>
</a>
</div>
{/if}
<div class="home-info-boxes{if $USER->is_logged_in()} loggedin{/if} fullwidth">
<div class="row">
<div class="col-md-4 panel panel-default">{if $USER->is_logged_in()}<a href="{$url.views}" title="{str tag=create}">{/if}<div id="home-info-create" class="home-info-box">
<h2 class="title">{str tag=create}</h2>
<p>{str tag=createsubtitle}</p>
<div class="mask"><div class="detail">{str tag=createdetail}</div></div>
</div>{if $USER->is_logged_in()}</a>{/if}
<div class="col-sm-4">
{if $USER->is_logged_in()}
<a href="{$url.views}" title="{str tag=create}" class="logged-in">{/if}
<div id="home-info-create" class="widget">
<div class="widget-heading">
<div class="circle-bg mrm">
<span class="glyphicon glyphicon-pencil"></span>
</div>
<h2 class="title">
{str tag=create}
</h2>
<p>{str tag=createsubtitle}</p>
</div>
<div class="widget-detail">
<p>{str tag=createdetail}</p>
</div>
</div>
{if $USER->is_logged_in()}
</a>{/if}
</div>
<div class="col-md-4 panel panel-default">{if $USER->is_logged_in()}<a href="{$url.share}">{/if}<div id="home-info-share" class="home-info-box">
<h2 class="title">{str tag=share}</h2>
<p>{str tag=sharesubtitle}</p>
<div class="mask"><div class="detail">{str tag=sharedetail}</div></div>
<div class="col-sm-4">
{if $USER->is_logged_in()}
<a href="{$url.share}" class="logged-in">{/if}
<div id="home-info-share" class="home-info-box">
<div class="widget-heading">
<div class="circle-bg mrm">
<span class="glyphicon glyphicon-share"></span>
</div>
<h2 class="title">
{str tag=share}
</h2>
<p>{str tag=sharesubtitle}</p>
</div>
<div class="widget-detail">
<p>{str tag=sharedetail}</p>
</div>
</div>{if $USER->is_logged_in()}</a>{/if}
</div>
<div class="col-md-4 panel panel-default">{if $USER->is_logged_in()}<a href="{$url.groups}">{/if}<div id="home-info-engage" class="home-info-box">
<h2 class="title">{str tag=engage}</h2>
<p>{str tag=engagesubtitle}</p>
<div class="mask"><div class="detail">{str tag=engagedetail}</div></div>
</div>{if $USER->is_logged_in()}</a>{/if}
<div class="col-sm-4">
{if $USER->is_logged_in()}
<a href="{$url.groups}" class="logged-in">{/if}
<div id="home-info-engage" class="home-info-box">
<div class="widget-heading">
<div class="circle-bg mrm">
<span class="glyphicon glyphicon-comment"></span>
</div>
<h2 class="title">
{str tag=engage}
</h2>
<p>{str tag=engagesubtitle}</p>
</div>
<div class="widget-detail">
<p>{str tag=engagedetail}</p>
</div>
</div>{if $USER->is_logged_in()}
</a>{/if}
</div>
</div>
</div>
......
......@@ -4,8 +4,8 @@
{include file="homeinfo.tpl" url=$url}
{/if}
{if $dashboardview}
<div class="rbuttons" id="editdashboard">
<a class="btn" href="{$WWWROOT}view/blocks.php?id={$viewid}"><span class="btn-edit">{str tag='editdashboard'}</span></a>
<div class="text-right" id="editdashboard">
<a class="btn btn-success" href="{$WWWROOT}view/blocks.php?id={$viewid}"><span class="btn-edit">{str tag='editdashboard'}</span></a>
</div>
{include file="user/dashboard.tpl"}
{/if}
......
......@@ -4,21 +4,17 @@
<a href="{$sbdata.profileiconurl}" title="{str tag="editprofileicon" section="artefact.file"}"><img src="{profile_icon_url user=$sbdata.id maxheight=50 maxwidth=50}" alt="{str tag="editprofileicon" section="artefact.file"}"></a>
</div>
</div>
<!-- <div class="sidebar-content panel-body">
{if $sbdata.mnetloggedinfrom}<p>{$sbdata.mnetloggedinfrom|clean_html|safe}</p>
{if $sbdata.mnetloggedinfrom}
<div class="sidebar-content panel-body">
<p>{$sbdata.mnetloggedinfrom|clean_html|safe}</p>
</div>
{/if}
</div> -->
<ul class="list-group">
<li id="invitedgroups" class="list-group-item"><a href="#">
<span id="invitedgroupscount" class="badge pull-right">30</span>
<span id="invitedgroupsmessage">pending group</span>
</a></li>
<!-- {if $sbdata.invitedgroups}
{if $sbdata.invitedgroups}
<li id="invitedgroups" class="list-group-item"><a href="{$WWWROOT}group/mygroups.php?filter=invite" class="btn-group">
<span id="invitedgroupsmessage">{$sbdata.invitedgroupsmessage}</span>
<span id="invitedgroupscount">{$sbdata.invitedgroups}</span>
</a></li>
{/if} -->
{/if}
{if $sbdata.pendingfriends}
<li id="pendingfriends" class="list-group-item"><a href="{$WWWROOT}user/myfriends.php?filter=pending" class="btn-friend">
<span id="pendingfriendscount" class="badge pull-right">{$sbdata.pendingfriends}</span>
......
<div id="view" class="cb">
<div id="view" class="dashboard mtl">
<div id="bottom-pane">
<div id="column-container">
{$viewcontent|safe}
<div class="cb"></div>
</div>
</div>
</div>
......@@ -9,8 +9,8 @@
{/if}
</h1>
{if $ownprofile}
<div class="rbuttons userviewrbuttons">
<a title="{str tag=editthisview section=view}" href="{$WWWROOT}view/blocks.php?profile=1" class="btn">{str tag=editthisview section=view}</a>
<div class="text-right userviewrbuttons">
<a title="{str tag=editthisview section=view}" href="{$WWWROOT}view/blocks.php?profile=1" class="btn btn-success">{str tag=editthisview section=view}</a>
</div>
{/if}
{/if}
......
<div class="blockinstance cb bt-{$blocktype}{if $retractable} retractable{/if}" id="blockinstance_{$id}">
{if $title}<div class="blockinstance-header{if $retractable && $retractedonload} retracted{/if}">
<div class="blockinstance bt-{$blocktype}{if $retractable} retractable{/if} panel panel-default" id="blockinstance_{$id}">
{if $title}<div class="blockinstance-header{if $retractable && $retractedonload} retracted{/if} panel-heading">
{if $retractable}
<span class="arrow retractor"></span>
{/if}
......@@ -7,16 +7,16 @@
-->{if $retractable}<span class="retractor">{/if}<!--
-->{$title}<!--
-->{if $retractable}</span>{/if}<!--
-->{if $viewartefacturl} <a href="{$viewartefacturl}" title="{str tag=clickformoreinformation section=view}"><!--
--><img alt="{str tag=detailslinkalt section=view}" src="{theme_url filename='images/detail_small.png'}" /><!--
-->{if $viewartefacturl} <a href="{$viewartefacturl}" title="{str tag=clickformoreinformation section=view}" class="detail-link"><!--
--><span class="glyphicon glyphicon-list-alt"></span><span class="{str tag=detailslinkalt section=view}"></span>
<!--
--></a>{/if}<!--
-->{if $feedlink} <a href="{$feedlink}"><!--
--><img class="feedicon" src="{theme_url filename='images/feed.png'}"><!--
--></a>{/if}<!--
--></h2>
<span class="cb"></span>
</div>{/if}
<div class="blockinstance-content{if $retractable && $retractedonload} js-hidden{/if}">
<div class="blockinstance-content{if $retractable && $retractedonload} js-hidden{/if} panel-content">
{$content|safe}
</div>
</div>
......
<div id="row_{$row}_column_{$column}" class="column columns{$numcolumns}{if $column == 1} firstcolumn{/if}{if $column == $numcolumns} lastcolumn{/if}"{if $width} style="width: {$width-2}%;"{/if}>
<div id="row_{$row}_column_{$column}" class="column columns{$numcolumns}{if $column == 1} firstcolumn{/if}{if $column == $numcolumns} lastcolumn{/if} col-md-6">
<div class="column-content">
{$blockcontent|safe}
</div>
......
......@@ -7,6 +7,7 @@
{else}
{if $accesslists.collections}
<div class="table-responsive">
<table class="fullwidth accesslists table table-striped">
<thead>
<tr>
......@@ -23,9 +24,11 @@
{/foreach}
</tbody>
</table>
</div>
{/if}
{if $accesslists.views}
<div class="table-responsive">
<table class="fullwidth accesslists table table-striped">
<thead>
<tr>
......@@ -49,6 +52,7 @@
{/foreach}
</tbody>
</table>
</div>
{/if}
{/if}
......
{include file="header.tpl"}
<p class="intro">{str tag=sharedviewsdescription section=view}</p>
<div>{$searchform|safe}</div>
<div class="table-responsive">
<table id="sharedviewlist" class="fullwidth table table-striped">
<thead>
<tr>
......@@ -13,5 +14,6 @@
{include file="view/sharedviewrows.tpl"}
</tbody>
</table>
</div>
{$pagination|safe}
{include file="footer.tpl"}
......@@ -3,12 +3,12 @@
{if $notrudeform}<div class="message deletemessage">{$notrudeform|safe}</div>{/if}
{if !$microheaders && ($mnethost || $editurl)}
<div class="viewrbuttons">
<div class="text-right view-button">
{if $editurl}{strip}
{if $new}
<a class="btn" href="{$editurl}">{str tag=back}</a>
<a class="btn btn-success" href="{$editurl}">{str tag=back}</a>
{else}
<a title="{str tag=editthisview section=view}" href="{$editurl}" class="btn editview">{str tag=editthisview section=view}</a>
<a title="{str tag=editthisview section=view}" href="{$editurl}" class="btn btn-success">{str tag=editthisview section=view}</a>
{/if}
{/strip}{/if}
{if $mnethost}<a href="{$mnethost.url}" class="btn">{str tag=backto arg1=$mnethost.name}</a>{/if}
......
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