Commit 18d57d4d authored by Liam Sharpe's avatar Liam Sharpe Committed by Aaron Wells
Browse files

Added white panel-bodies to the admin area, fixed a few seachbars, removed and...

Added white panel-bodies to the admin area, fixed a few seachbars, removed and tidyed unnecessary code (Bootstrap)

Bug 1465107: Use Bootstrap CSS Framework

Change-Id: I469b2295e7d8408c29ad329c859775ecd41b31ea
parent 9fc5216c
...@@ -29,7 +29,7 @@ $data = build_grouplist_html($query, $limit, $offset); ...@@ -29,7 +29,7 @@ $data = build_grouplist_html($query, $limit, $offset);
$searchform = pieform(array( $searchform = pieform(array(
'name' => 'search', 'name' => 'search',
'renderer' => 'div', 'renderer' => 'div',
'class' => 'form-inline', 'class' => 'form-inline mbl',
'elements' => array( 'elements' => array(
'inputgroup' => array( 'inputgroup' => array(
'type' => 'fieldset', 'type' => 'fieldset',
......
...@@ -139,6 +139,7 @@ unset($prefs); ...@@ -139,6 +139,7 @@ unset($prefs);
$form = pieform(array( $form = pieform(array(
'name' => 'adduser', 'name' => 'adduser',
'class' => 'panel panel-body pts',
'autofocus' => false, 'autofocus' => false,
'template' => 'adduser.php', 'template' => 'adduser.php',
'templatedir' => pieform_template_dir('adduser.php'), 'templatedir' => pieform_template_dir('adduser.php'),
......
...@@ -28,6 +28,7 @@ $query = param_variable('query', ''); ...@@ -28,6 +28,7 @@ $query = param_variable('query', '');
$offset = param_integer('offset', 0); $offset = param_integer('offset', 0);
$limit = 20; $limit = 20;
$customthemedefaults = array( $customthemedefaults = array(
'background' => array('type' => 'color', 'value' => '#182768'), 'background' => array('type' => 'color', 'value' => '#182768'),
'backgroundfg' => array('type' => 'color', 'value' => '#FFFFFF'), 'backgroundfg' => array('type' => 'color', 'value' => '#FFFFFF'),
...@@ -614,18 +615,27 @@ else { ...@@ -614,18 +615,27 @@ else {
/*search institution form*/ /*search institution form*/
$searchform = pieform(array( $searchform = pieform(array(
'name' => 'search', 'name' => 'search',
'renderer' => 'oneline', 'renderer' => 'div',
'class' => 'form-inline mbl',
'elements' => array(
'inputgroup' => array(
'type' => 'fieldset',
'title' => get_string('Query') . ': ',
'class' => 'input-group form-inline',
'elements' => array( 'elements' => array(
'query' => array( 'query' => array(
'type' => 'text', 'type' => 'text',
'defaultvalue' => $query 'defaultvalue' => $query,
), ),
'submit' => array( 'submit' => array(
'type' => 'submit', 'type' => 'button',
'class' => 'btn btn-success', 'usebuttontag' => true,
'value' => get_string('search') 'class' => 'btn btn-success input-group-btn',
) 'value' => get_string('search'),
) )
),
),
),
)); ));
$smarty->assign('searchform', $searchform); $smarty->assign('searchform', $searchform);
......
...@@ -27,6 +27,7 @@ $staffusers = get_column('usr', 'id', 'staff', 1, 'deleted', 0); ...@@ -27,6 +27,7 @@ $staffusers = get_column('usr', 'id', 'staff', 1, 'deleted', 0);
$form = pieform(array( $form = pieform(array(
'name' => 'staffusers', 'name' => 'staffusers',
// 'class' => 'panel panel-body',
'elements' => array( 'elements' => array(
'users' => array( 'users' => array(
'type' => 'userlist', 'type' => 'userlist',
......
...@@ -109,10 +109,6 @@ function getstylesheets($stylesheets){ ...@@ -109,10 +109,6 @@ function getstylesheets($stylesheets){
return $stylesheets; return $stylesheets;
} }
/** /**
* This function creates a Smarty object and sets it up for use within our * This function creates a Smarty object and sets it up for use within our
* podclass app, setting up some variables. * podclass app, setting up some variables.
......
{include file='header.tpl'} {include file='header.tpl'}
<div class="panel panel-body">
<p>{str tag=htmlfiltersdescription section=admin}</p> <p>{str tag=htmlfiltersdescription section=admin}</p>
{if $filters} {if $filters}
<h3>{str tag=installed section=admin}:</h3> <h3>{str tag=installed section=admin}:</h3>
<ul> <ul>
{foreach from=$filters item=filter} {foreach from=$filters item=filter}
<li>{$filter->site}</li> <li>{$filter->site}</li>
{/foreach} {/foreach}
</ul> </ul>
{else} {else}
<p>{str tag=nofiltersinstalled section=admin}</p> <p>{str tag=nofiltersinstalled section=admin}</p>
{/if} {/if}
<p>{$newfiltersdescription}</p>
<div>{$reloadform|safe}</div>
<p>{$newfiltersdescription}</p>
<div>{$reloadform|safe}</div>
</div>
{include file='footer.tpl'} {include file='footer.tpl'}
\ No newline at end of file
{include file="header.tpl"} {include file="header.tpl"}
<p>{str tag=allowediframesitesdescription section=admin}</p> <div class="panel panel-body">
<p>{str tag=allowediframesitesdescriptiondetail section=admin}</p> <p>{str tag=allowediframesitesdescription section=admin}</p>
<p>{str tag=allowediframesitesdescriptiondetail section=admin}</p>
{if $editurls} {if $editurls}
<table class="iframesources fullwidth"> <table class="iframesources fullwidth">
<thead> <thead>
<tr> <tr>
<th>{str tag=Site}</th> <th>{str tag=Site}</th>
...@@ -28,9 +28,9 @@ ...@@ -28,9 +28,9 @@
</tr> </tr>
{/foreach} {/foreach}
</tbody> </tbody>
</table> </table>
{/if} {/if}
{$newform|safe}
{$newform|safe}
</div>
{include file="footer.tpl"} {include file="footer.tpl"}
{include file='header.tpl'} {include file='header.tpl'}
<div class="panel panel-body">
<div id="adminplugin"> <div id="adminplugin">
<b>{str tag='pluginexplainaddremove'} <b>{str tag='pluginexplainaddremove'}
<br/><br/>{str tag='pluginexplainartefactblocktypes'}<br/><br/></b> <br/><br/>{str tag='pluginexplainartefactblocktypes'}<br/><br/></b>
<ul class="adminpluginstypes"> <ul class="adminpluginstypes">
...@@ -57,6 +57,6 @@ ...@@ -57,6 +57,6 @@
{/foreach} {/foreach}
</ul> </ul>
<div class="cb"></div> <div class="cb"></div>
</div>
</div> </div>
{include file='footer.tpl'} {include file='footer.tpl'}
{include file="header.tpl"} {include file="header.tpl"}
<div class="panel panel-body">
<form action="{$WWWROOT}admin/groups/archive.php" method="post"> <form action="{$WWWROOT}admin/groups/archive.php" method="post">
{if $search->sortby} {if $search->sortby}
<input type="hidden" name="sortby" id="sortby" value="{$search->sortby}"> <input type="hidden" name="sortby" id="sortby" value="{$search->sortby}">
...@@ -79,5 +79,5 @@ ...@@ -79,5 +79,5 @@
<div>{str tag="noresultsfound"}</div> <div>{str tag="noresultsfound"}</div>
{/if} {/if}
</div> </div>
</div>
{include file="footer.tpl"} {include file="footer.tpl"}
{include file="header.tpl"} {include file="header.tpl"}
<div class="panel panel-body">
{$optionform|safe} {$optionform|safe}
<h3>{str tag=addcategories section=admin}</h3> <h3>{str tag=addcategories section=admin}</h3>
<p>{str tag=groupcategoriespagedescription section=admin}</p> <p>{str tag=groupcategoriespagedescription section=admin}</p>
<div id="editmenus"> <div id="editmenus">
<div id="menuitemlist"></div> <div id="menuitemlist"></div>
</div> </div>
</div>
{include file="footer.tpl"} {include file="footer.tpl"}
{include file="header.tpl"} {include file="header.tpl"}
<div class="panel panel-body">
{$searchform|safe} {$searchform|safe}
<table id="admgroupslist" class="fullwidth table table-striped"> <table id="admgroupslist" class="fullwidth table table-striped mbm">
<thead> <thead>
<tr> <tr>
<th>{str tag="groupname" section="admin"}</th> <th>{str tag="groupname" section="admin"}</th>
...@@ -20,5 +20,5 @@ ...@@ -20,5 +20,5 @@
</tbody> </tbody>
</table> </table>
{$results.pagination|safe} {$results.pagination|safe}
</div>
{include file="footer.tpl"} {include file="footer.tpl"}
{include file="header.tpl"} {include file="header.tpl"}
<div class="panel panel-body">
{$uploadcsvpagedescription|safe} {$uploadcsvpagedescription|safe}
{$uploadcsvform|safe} {$uploadcsvform|safe}
{include file="progress_meter.tpl"} {include file="progress_meter.tpl"}
</div>
{include file="footer.tpl"} {include file="footer.tpl"}
{include file="header.tpl"} {include file="header.tpl"}
<div class="panel panel-body">
<p>{str tag="adminuserspagedescription1" section="admin"}</p> <p>{str tag="adminuserspagedescription1" section="admin"}</p>
<div class="userlistform"> <div class="userlistform">
{$adminusersform|safe} {$adminusersform|safe}
</div> </div>
</div>
{include file="footer.tpl"} {include file="footer.tpl"}
{include file="header.tpl"} {include file="header.tpl"}
<div class="panel panel-body">
<form action="{$WWWROOT}admin/users/exportqueue.php" method="post"> <form action="{$WWWROOT}admin/users/exportqueue.php" method="post">
{if $search->sortby} {if $search->sortby}
<input type="hidden" name="sortby" id="sortby" value="{$search->sortby}"> <input type="hidden" name="sortby" id="sortby" value="{$search->sortby}">
...@@ -63,5 +63,6 @@ ...@@ -63,5 +63,6 @@
<div>{str tag="noresultsfound"}</div> <div>{str tag="noresultsfound"}</div>
{/if} {/if}
</div> </div>
</div>
{include file="footer.tpl"} {include file="footer.tpl"}
{include file="header.tpl"} {include file="header.tpl"}
<div class="panel panel-body">
<p>{str tag="institutionadminuserspagedescription1" section="admin"}</p> <p>{str tag="institutionadminuserspagedescription1" section="admin"}</p>
{$institutionselector|safe} {$institutionselector|safe}
<div class="userlistform"> <div class="userlistform">
{$adminusersform|safe} {$adminusersform|safe}
</div> </div>
</div>
{include file="footer.tpl"} {include file="footer.tpl"}
...@@ -2,10 +2,10 @@ ...@@ -2,10 +2,10 @@
{if $delete_form} {if $delete_form}
<h3>{str tag="deleteinstitution" section="admin"}</h3> <h3>{str tag="deleteinstitution" section="admin"}</h3>
<p><strong>{$institutionname}</strong></p> <p><strong>{$institutionname}</strong></p>
<p>{str tag="deleteinstitutionconfirm" section="admin"}</p> <p>{str tag="deleteinstitutionconfirm" section="admin"}</p>
{$delete_form|safe} {$delete_form|safe}
{elseif $institution_form} {elseif $institution_form}
{if $suspended} {if $suspended}
<div class=""> <div class="">
...@@ -29,10 +29,11 @@ ...@@ -29,10 +29,11 @@
<div class="detail">{$suspendform|safe}</div> <div class="detail">{$suspendform|safe}</div>
</div> </div>
{/if} {/if}
{$institution_form|safe} {$institution_form|safe}
{else} {else}
{$searchform|safe} <div class="panel panel-body">
<div class="table-responsive"> {$searchform|safe}
<div class="table-responsive">
<table id="adminstitutionslist" class="fullwidth table table-striped"> <table id="adminstitutionslist" class="fullwidth table table-striped">
<thead> <thead>
<tr> <tr>
...@@ -72,10 +73,11 @@ ...@@ -72,10 +73,11 @@
{$results.tablerows|safe} {$results.tablerows|safe}
</tbody> </tbody>
</table> </table>
</div>
</div> </div>
<div class="center"> <div class="center">
{$results.pagination|safe} {$results.pagination|safe}
</div> </div>
{/if} {/if}
{include file="footer.tpl"} {include file="footer.tpl"}
...@@ -25,16 +25,21 @@ ...@@ -25,16 +25,21 @@
<td class="controls"> <td class="controls">
<form action="" method="post"> <form action="" method="post">
<input type="hidden" name="i" value="{$institution->name}"> <input type="hidden" name="i" value="{$institution->name}">
<input type="hidden" name="edit" value=1> <button type="submit" name="edit" value="1" class="btn-link btn btn-xs pull-right" alt="{str(tag=editspecific arg1=$institution->displayname)|escape:html|safe}">
<input type="image" name="edit" title="{str tag="edit"}" src="{theme_url filename="images/btn_edit.png"}" alt="{str(tag=editspecific arg1=$institution->displayname)|escape:html|safe}"> <span class="icon icon-cog icon-lg text-default"></span>
</form> <span class="sr-only">
{str tag="edit"}
</span>
</button>
{if $siteadmin && !$institution->members && $institution->name != 'mahara'} {if $siteadmin && !$institution->members && $institution->name != 'mahara'}
<form action="" method="post"> <button type="submit" name="delete" value="1" class="btn-link btn btn-xs pull-right" alt="{str(tag=deletespecific arg1=$institution->displayname)|escape:html|safe}">
<input type="hidden" name="i" value="{$institution->name}"> <span class="icon icon-trash text-danger icon-lg"></span>
<input type="hidden" name="delete" value="1"> <span class="sr-only">
<input type="image" name="delete" title="{str tag="delete"}" src="{theme_url filename="images/btn_deleteremove.png"}" alt="{str(tag=deletespecific arg1=$institution->displayname)|escape:html|safe}"> {str tag="delete"}
</form> </span>
</button>
{/if} {/if}
</form>
</td> </td>
</tr> </tr>
{/foreach} {/foreach}
{include file="header.tpl"} {include file="header.tpl"}
<div class="panel panel-body">
<p>{str tag="institutionstaffuserspagedescription1" section="admin"}</p> <p>{str tag="institutionstaffuserspagedescription1" section="admin"}</p>
{$institutionselector|safe} {$institutionselector|safe}
<div class="userlistform"> <div class="userlistform">
{$staffusersform|safe} {$staffusersform|safe}
</div> </div>
</div>
{include file="footer.tpl"} {include file="footer.tpl"}
{include file="header.tpl"} {include file="header.tpl"}
<p>{str tag="institutionmemberspagedescription" section="admin"}</p> <div class="panel panel-body">
<p>{$instructions}</p> <p>{str tag="institutionmemberspagedescription" section="admin"}</p>
{$usertypeselector|safe} <p>{$instructions}</p>
<div class="userlistform"> {$usertypeselector|safe}
{$institutionusersform|safe} <div class="userlistform">
{$institutionusersform|safe}
</div>
</div> </div>
{include file="footer.tpl"} {include file="footer.tpl"}
{include file="header.tpl"} {include file="header.tpl"}
<div class="panel panel-body">
<table id="notificationstable" class="fullwidth table"> <table id="notificationstable" class="fullwidth table">
<thead> <thead>
<tr> <tr>
...@@ -28,5 +28,5 @@ ...@@ -28,5 +28,5 @@
{/foreach} {/foreach}
</tbody> </tbody>
</table> </table>
</div>
{include file="footer.tpl"} {include file="footer.tpl"}
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