Commit c3a83948 authored by Nigel McNie's avatar Nigel McNie
Browse files

The new them. My last request: a pixie caramel!

* A more neutral colour scheme, appropriate for a default installation
* Forms are layed out with the title beside the inputs
* The profile page is in tabs
* Layout is cleaner and clearer
* Still will be some bugs, especially in IE!
parent 6e3bb9f1
......@@ -7,7 +7,7 @@
{$form}
{if $groups}
<table>
<table id="findgroups">
{foreach from=$groups item=group name=groups}
<tr class="r{cycle values=0,1}">
<td>
......
......@@ -2,28 +2,28 @@
<h6><a href="{$WWWROOT}user/view.php?id={$group->owner|escape}">{$group->owner|display_name|escape}</a></h6>
{$group->description}
<ul>
<li>{str tag="memberslist" section="group"}
{if $group->member1}<a href="{$WWWROOT}user/view.php?id={$group->member1|escape}">{$group->member1|display_name|escape}</a>{/if}
{if $group->member2}, <a href="{$WWWROOT}user/view.php?id={$group->member2|escape}">{$group->member2|display_name|escape}</a>{/if}
{if $group->member3}, <a href="{$WWWROOT}user/view.php?id={$group->member3|escape}">{$group->member3|display_name|escape}</a>{/if}
{if $group->membercount > 3}<a href="{$WWWROOT}group/view.php?id={$group->id|escape}&amp;#members">...</a>{/if}
<li id="groupmembers">{str tag="memberslist" section="group"}
{if $group->member1}<a href="{$WWWROOT}user/view.php?id={$group->member1|escape}" class="links-members">{$group->member1|display_name|escape}</a>{/if}
{if $group->member2}, <a href="{$WWWROOT}user/view.php?id={$group->member2|escape}" class="links-members">{$group->member2|display_name|escape}</a>{/if}
{if $group->member3}, <a href="{$WWWROOT}user/view.php?id={$group->member3|escape}" class="links-members">{$group->member3|display_name|escape}</a>{/if}
{if $group->membercount > 3}<a href="{$WWWROOT}group/view.php?id={$group->id|escape}&amp;#members" class="links-members">...</a>{/if}
</li>
{if $group->type == 'member'}
<li>{str tag="youaregroupmember" section="group"}</li>
{if $group->canleave}
<li><a href = "{$WWWROOT}group/leave.php?id={$group->id|escape}&amp;returnto={$returnto}">{str tag="leavegroup" section="group"}</a></li>
<li><a href = "{$WWWROOT}group/leave.php?id={$group->id|escape}&amp;returnto={$returnto}" id="btn-leavegroup">{str tag="leavegroup" section="group"}</a></li>
{/if}
{elseif $group->type == 'owner'}
<li><a href="{$WWWROOT}group/edit.php?id={$group->id|escape}">{str tag="edit"}</a></li>
<li><a href="{$WWWROOT}group/delete.php?id={$group->id|escape}">{str tag="delete"}</a></li>
<li><a href="{$WWWROOT}group/edit.php?id={$group->id|escape}" id="btn-edit">{str tag="edit"}</a></li>
<li><a href="{$WWWROOT}group/delete.php?id={$group->id|escape}" id="btn-delete">{str tag="delete"}</a></li>
{if $group->jointype == 'request' && $group->requests}
<li>
{if $group->requests == 1}
<a href="{$WWWROOT}group/view.php?id={$group->id|escape}&amp;pending={$group->requests|escape}#members">{str tag="thereispendingrequest" section="group"}</a>
<a href="{$WWWROOT}group/view.php?id={$group->id|escape}&amp;pending={$group->requests|escape}#members" id="btn-requests">{str tag="thereispendingrequest" section="group"}</a>
{else}
<a href="{$WWWROOT}group/view.php?id={$group->id|escape}&amp;pending={$group->requests[0]|escape}#members">{str tag="therearependingrequests" args=$group->requests}</a>
<a href="{$WWWROOT}group/view.php?id={$group->id|escape}&amp;pending={$group->requests[0]|escape}#members" id="btn-requests">{str tag="therearependingrequests" args=$group->requests}</a>
{/if}
</li>
{/if}
......@@ -41,7 +41,7 @@
{$group->groupjoin}
{elseif $group->jointype == 'request'}
<li><a href="{$WWWROOT}group/requestjoin.php?id={$group->id|escape}&amp;returnto={$returnto}">{str tag="requestjoingroup" section="group"}</a></li>
<li><a href="{$WWWROOT}group/requestjoin.php?id={$group->id|escape}&amp;returnto={$returnto}" id="btn-requests">{str tag="requestjoingroup" section="group"}</a></li>
{/if}
</ul>
......@@ -3,13 +3,13 @@
{include file="columnleftstart.tpl"}
<div class="addgrouplink">
<span class="addicon">
<span class="addicon fr">
<a href="{$WWWROOT}group/create.php">{str tag="creategroup" section="group"}</a>
</span>
</div>
{$form}
{if $groups}
<table>
<table id="mygroupstable">
{foreach from=$groups item=group}
<tr class="r{cycle values=0,1}">
<td>
......
......@@ -3,8 +3,9 @@
{include file="columnleftstart.tpl"}
<h2>{$group->name|escape}</h2>
<h3>{str tag='owner' section='group'}: {$group->ownername|escape}</h3>
{if $group->description} {$group->description}{/if}
{if $group->description} <p>{$group->description}</p> {/if}
<ul id="groupsviewlist"><li><label>{str tag='owner' section='group'}:</label> {$group->ownername|escape}</li></ul>
{assign var="jointype" value=$group->jointype}
{assign var="joinstr" value=groupjointype$jointype}
{if !$member}<p>{str tag=$joinstr section='group'}</p>{/if}
......@@ -14,7 +15,7 @@
{elseif $canacceptinvite} <p>{str tag='grouphaveinvite' section='group'} <a href="view.php?id={$group->id}&amp;joincontrol=acceptinvite">{str tag='acceptinvitegroup' section='group'}</a> | <a href="view.php?id={$group->id}&amp;joincontrol=declineinvite">{str tag='declineinvitegroup' section='group'}</a></p>{/if}
{if $member}
<div class="groupviews">
<h5>{str tag='views'}</h5>
<h3>{str tag='views'}</h3>
{if ($tutor || $staff || $admin) && $controlled}
<form>
<select name="submitted" onChange="viewlist.submitted=this.options[this.selectedIndex].value;viewlist.doupdate();">
......@@ -28,6 +29,7 @@
<tr>
<th>{str tag='name'}</th>
<th>{str tag='owner' section='group'}</th>
<th></th>
</tr>
</thead>
<tbody>
......@@ -36,7 +38,7 @@
</div>
<div class="groupmembers">
<a name="members"></a>
<h5>{str tag='members' section='group'}</h5>
<h3>{str tag='members' section='group'}</h3>
{if $canupdate && $request}
<form>
<select id="pendingselect" name="pending" onChange="switchPending();">
......@@ -50,6 +52,8 @@
<tr>
<th>{str tag='name'}</th>
<th id="pendingreasonheader">{str tag='reason'}</th>
<th></th>
<th></th>
</tr>
</thead>
<tbody>
......
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
<head>
<meta http-equiv="Content-type" content="text/html; charset=UTF-8">
<title>{$PAGETITLE|escape}</title>
<script type="text/javascript">
var config = {literal}{{/literal}
'theme': {$THEMELIST},
'sesskey' : '{$SESSKEY}',
'wwwroot': '{$WWWROOT}',
'loggedin': {$USER->is_logged_in()|intval},
'userid': {$USER->get('id')}
{literal}}{/literal};
</script>
{$STRINGJS}
{foreach from=$JAVASCRIPT item=script} <script type="text/javascript" src="{$script}"></script>
<head>
<meta http-equiv="Content-type" content="text/html; charset=UTF-8">
<title>{$PAGETITLE|escape}</title>
<script type="text/javascript">
var config = {literal}{{/literal}
'theme': {$THEMELIST},
'sesskey' : '{$SESSKEY}',
'wwwroot': '{$WWWROOT}',
'loggedin': {$USER->is_logged_in()|intval},
'userid': {$USER->get('id')}
{literal}}{/literal};
</script>
{$STRINGJS}
{foreach from=$JAVASCRIPT item=script}
<script type="text/javascript" src="{$script}"></script>
{/foreach}
{foreach from=$HEADERS item=header} {$header}
{foreach from=$HEADERS item=header}
{$header}
{/foreach}
{if isset($INLINEJAVASCRIPT)}
<script type="text/javascript">
<script type="text/javascript">
{$INLINEJAVASCRIPT}
</script>
</script>
{/if}
{foreach from=$STYLESHEETLIST item=cssurl}
<link rel="stylesheet" type="text/css" href="{$cssurl}">
<link rel="stylesheet" type="text/css" href="{$cssurl}">
{/foreach}
<link rel="stylesheet" type="text/css" href="{theme_path location='style/print.css'}" media="print">
</head>
<body>
<div id="container">
<div id="loading_box" class="hidden"></div>
<div id="topwrapper">
<table cellspacing="0" class="searchbox fr">
<link rel="stylesheet" type="text/css" href="{theme_path location='style/print.css'}" media="print">
</head>
<body>
<div id="container">
<div id="loading_box" class="hidden"></div>
<div id="topwrapper">
<table cellspacing="0" class="searchbox fr">
{if !$nosearch && $LOGGEDIN}
<tr>
<td>{$searchform}</td>
</tr>
<tr>
<td>{$searchform}</td>
</tr>
{/if}
{if defined('MENUITEM') && MENUITEM == '' && !$LOGGEDIN && (count($LANGUAGES) > 1)}
<tr class="headerlanguage">
<td>
<form method="post">
<label>{str tag=language}: </label>
<select name="lang">
<option value="default" selected="selected">{$sitedefaultlang}</option>
<tr class="headerlanguage">
<td>
<form method="post">
<label>{str tag=language}: </label>
<select name="lang">
<option value="default" selected="selected">{$sitedefaultlang}</option>
{foreach from=$LANGUAGES key=k item=i}
<option value="{$k|escape}">{$i|escape}</option>
<option value="{$k|escape}">{$i|escape}</option>
{/foreach}
</select>
<input type="submit" class="submit" name="changelang" value="{str tag=change}" />
</form>
</td>
</tr>
</select>
<input type="submit" class="submit" name="changelang" value="{str tag=change}" />
</form>
</td>
</tr>
{/if}
</table>
<div id="logo"><a href="{$WWWROOT}"><img src="{theme_path location='images/logo.gif'}" border="0" alt=""></a></div>
<h1 class="hidden"><a href="{$WWWROOT}">{$hiddenheading|default:"Mahara"|escape}</a></h1>
</table>
<div id="logo"><a href="{$WWWROOT}"><img src="{theme_path location='images/logo.gif'}" border="0" alt=""></a></div>
<h1 class="hidden"><a href="{$WWWROOT}">{$hiddenheading|default:"Mahara"|escape}</a></h1>
{if $MAINNAV}
<div id="mainnav">
<ul>
<div id="mainnav">
<ul>
{foreach from=$MAINNAV item=item}
{if $item.selected}{assign var=MAINNAVSELECTED value=$item}
<li class="selected"><a href="{$WWWROOT}{$item.url|escape}">{$item.title|escape}</a></li>
{else}
<li><a href="{$WWWROOT}{$item.url|escape}">{$item.title|escape}</a></li>
{/if}
{/foreach}
{if $item.selected}{assign var=MAINNAVSELECTED value=$item}<li class="selected"><a href="{$WWWROOT}{$item.url|escape}">{$item.title|escape}</a></li>{else}<li><a href="{$WWWROOT}{$item.url|escape}">{$item.title|escape}</a></li>{/if}{/foreach}
{if $LOGGEDIN}
{if $USER->get('admin') || $USER->is_institutional_admin()}
{if $ADMIN || $INSTITUTIONALADMIN}
<li><a href="{$WWWROOT}">Return to Site</a></li>
<li><a href="{$WWWROOT}">Return to Site</a></li>
{elseif $USER->get('admin')}
<li><a href="{$WWWROOT}admin/">Site Administration</a></li>
<li><a href="{$WWWROOT}admin/">Site Administration</a></li>
{else}
<li><a href="{$WWWROOT}admin/users/search.php">User Administration</a></li>
<li><a href="{$WWWROOT}admin/users/search.php">User Administration</a></li>
{/if}
{* <li><a href="" onclick="createLoggingPane(); return false;">Create Logging Pane</a></li> *}
{* <li><a href="" onclick="createLoggingPane(); return false;">Create Logging Pane</a></li> *}
{/if}
<li><a href="{$WWWROOT}?logout">Logout</a></li>
<li><a href="{$WWWROOT}?logout">Logout</a></li>
{/if}
</ul>
</div>
</div>
<div id="subnav">
</ul>
</div>
</div>
<div id="subnav">
{if $MAINNAVSELECTED.submenu}
<ul>
{foreach from=$MAINNAVSELECTED.submenu item=item}
<li{if $item.selected} class="selected"{/if}><a href="{$WWWROOT}{$item.url|escape}">{$item.title|escape}</a></li>
{/foreach}
</ul>
<ul>
{foreach from=$MAINNAVSELECTED.submenu item=item}<li{if $item.selected} class="selected"{/if}><a href="{$WWWROOT}{$item.url|escape}">{$item.title|escape}</a>{/foreach}
</ul>
{/if}
{/if}
</div>
<div id="mainwrapper">
{insert name="messages"}
</div>
<div id="mainwrapper">
</div>
</div>
</div>
<div id="footer" class="micro_footer">
<div class="footerright"><img src="{theme_path location='images/footer_navbg_right.gif'}" border="0" alt=""></div>
</div>
</div>
{mahara_performance_info}
</div>
</div>
<div id="footerwrap">
<div id="footer">
{mahara_performance_info}
</div>
</div>
</div>
</div>
</body>
</html>
......@@ -26,26 +26,15 @@
<link rel="stylesheet" type="text/css" href="{$cssurl}">
{/foreach}
<link rel="stylesheet" type="text/css" href="{theme_path location='style/print.css'}" media="print">
<style type="text/css">
{literal}
body { background: white; }
.micro_footer { position: fixed; bottom: 3px; }
{/literal}
</style>
</head>
<body>
<div id="containerX">
<div id="loading_box" style="display: none;"></div>
<div id="topwrapperX">
<div id="header">
<div class="frX"></div>
<div id="logo"><a href="{$WWWROOT}"><img src="{theme_path location='images/logo_mahara.gif'}" border="0" alt=""></a></div>
<div id="topwrapper">
<div id="logo"><a href="{$WWWROOT}"><img src="{theme_path location='images/logo.gif'}" border="0" alt=""></a></div>
<h1 class="hidden"><a href="{$WWWROOT}">{$hiddenheading|default:"Mahara"|escape}</a></h1>
</div>
</div>
<div id="mainwrapperX">
<div id="mainwrapper">
{insert name="messages"}
<div id="maincontentwrapper">
<div class="maincontent">
{if $PAGEHELPNAME && $heading} <h2>{$heading|escape}<span id="{$PAGEHELPNAME}_container" class="pagehelpicon">{$PAGEHELPICON}</span></h2>{/if}
......@@ -10,8 +10,6 @@
{assign var="sideblock_name" value=$sideblock.name}
{include file="sideblocks/$sideblock_name.tpl" data=$sideblock.data}
<div class="sidebar-botcorners"><img src="{theme_path location='images/sidebox_bot.gif'}" border="0" alt=""></div>
</div>
{/foreach}
</div>
<h3>{str tag="linksandresources"}</h3>
{if $data}
<ul id="sitemenu">
<ul>
{foreach from=$data item=item}
<li class="{cycle values=r0,r1}"><a href="{$item.link|escape}">{$item.name}</a></li>
<li><strong><a href="{$item.link|escape}">{$item.name}</a></strong></li>
{/foreach}
</ul>
{/if}
......
<h3>{str tag="selfsearch"}{contextualhelp plugintype='core' pluginname='core' section='selfsearch'}</h3>
<h3>{str tag="selfsearch"}</h3>
<form id="selfsearch" method="post" action="{$WWWROOT}selfsearch.php">
<input type="text" name="query">
<button type="submit" class="button">{str tag="go"}</button>
......
......@@ -23,6 +23,7 @@
{$message}
</div>
{/if}
</div>
{include file="columnleftend.tpl"}
{include file="footer.tpl"}
File mode changed from 100644 to 100755
{if $user->pending}
<td class="pending">
<div class="fl">
<div class="center" style="width: 40px; height: 40px;">
<img src="{$WWWROOT}thumb.php?type=profileicon&amp;maxwidth=40&amp;maxheight=40&amp;id={$user->id}" alt="">
</div>
</div>
<table class="friendinfo">
<tr>
<th>
......@@ -21,7 +16,10 @@
</tr>
<tr>
<td id="friendinfo_{$user->id}">
{if $user->introduction}
<div class="fl">
<img src="{$WWWROOT}thumb.php?type=profileicon&amp;maxwidth=40&amp;maxheight=40&amp;id={$user->id}" alt="">
</div>
{if $user->introduction}
{$user->introduction}
{/if}
<div class="pending">
......@@ -33,13 +31,13 @@
<div>
<ul>
<li>
<a href="{$WWWROOT}user/denyrequest.php?id={$user->id}&amp;returnto={$page}">
<a href="{$WWWROOT}user/denyrequest.php?id={$user->id}&amp;returnto={$page}" id="btn-denyrequest">
{str tag='denyrequest' section='group'}
</a>
</li>
{if $user->messages}
<li>
<a href="{$WWWROOT}user/sendmessage.php?id={$user->id}&amp;returnto={$page}">
<a href="{$WWWROOT}user/sendmessage.php?id={$user->id}&amp;returnto={$page}" id="btn-sendmessage">
{str tag='sendmessage' section='group'}
</a>
</li>
......@@ -52,11 +50,6 @@
</td>
{elseif $user->friend}
<td>
<div class="fl">
<div class="center" style="width: 40px; height: 40px;">
<img src="{$WWWROOT}thumb.php?type=profileicon&amp;maxwidth=40&amp;maxheight=40&amp;id={$user->id}" alt="">
</div>
</div>
<table class="friendinfo">
<tr>
<th>
......@@ -95,6 +88,9 @@
</tr>
<tr>
<td id="friendinfo_{$user->id}">
<div class="fl">
<img src="{$WWWROOT}thumb.php?type=profileicon&amp;maxwidth=40&amp;maxheight=40&amp;id={$user->id}" alt="">
</div>
{if $user->introduction}
<p>
{$user->introduction}
......@@ -103,13 +99,13 @@
<ul>
{if $user->messages}
<li>
<a href="{$WWWROOT}user/sendmessage.php?id={$user->id}&amp;returnto={$page}">
<a href="{$WWWROOT}user/sendmessage.php?id={$user->id}&amp;returnto={$page}" id="btn-sendmessage">
{str tag='sendmessage' section='group'}
</a>
</li>
{/if}
<li>
<a href="{$WWWROOT}user/removefriend.php?id={$user->id}&amp;returnto={$page}">
<a href="{$WWWROOT}user/removefriend.php?id={$user->id}&amp;returnto={$page}" id="btn-delete">
{str tag='removefromfriendslist' section='group'}
</a>
</li>
......@@ -120,11 +116,6 @@
</td>
{elseif $user->requestedfriendship}
<td>
<div class="fl">
<div class="center" style="width: 40px; height: 40px;">
<img src="{$WWWROOT}thumb.php?type=profileicon&amp;maxwidth=40&amp;maxheight=40&amp;id={$user->id}" alt="">
</div>
</div>
<table class="friendinfo">
<tr>
<th>
......@@ -140,6 +131,9 @@
</tr>
<tr>
<td id="friendinfo_{$user->id}">
<div class="fl">
<img src="{$WWWROOT}thumb.php?type=profileicon&amp;maxwidth=40&amp;maxheight=40&amp;id={$user->id}" alt="">
</div>
{if $user->introduction}
{$user->introduction}
{/if}
......@@ -147,7 +141,7 @@
<ul>
{if $user->messages}
<li>
<a href="{$WWWROOT}user/sendmessage.php?id={$user->id}&amp;returnto={$page}">
<a href="{$WWWROOT}user/sendmessage.php?id={$user->id}&amp;returnto={$page}" id="btn-sendmessage">
{str tag='sendmessage' section='group'}
</a>
</li>
......@@ -160,17 +154,12 @@
</td>
{else}
<td>
<div class="fl">
<div class="center" style="width: 40px; height: 40px;">
<img src="{$WWWROOT}thumb.php?type=profileicon&amp;maxwidth=40&amp;maxheight=40&amp;id={$user->id}" alt="">
</div>
</div>
<table class="friendinfo">
<tr>
<th>
<div class="fr">
{if $user->friendscontrol == 'auth'}
<a href="{$WWWROOT}user/requestfriendship.php?id={$user->id}&amp;returnto={$page}">
<a href="{$WWWROOT}user/requestfriendship.php?id={$user->id}&amp;returnto={$page}" id="btn-request">
{str tag='sendfriendrequest' section='group'}
</a>
{elseif $user->friendscontrol == 'auto'}
......@@ -188,6 +177,9 @@
</tr>
<tr>
<td id="friendinfo_{$user->id}">
<div class="fl">
<img src="{$WWWROOT}thumb.php?type=profileicon&amp;maxwidth=40&amp;maxheight=40&amp;id={$user->id}" alt="">
</div>
{if $user->introduction}
{$user->introduction}
{/if}
......@@ -195,7 +187,7 @@
<ul>
{if $user->messages}
<li>
<a href="{$WWWROOT}user/sendmessage.php?id={$user->id}&amp;returnto={$page}">
<a href="{$WWWROOT}user/sendmessage.php?id={$user->id}&amp;returnto={$page}" id="btn-sendmessage">
{str tag='sendmessage' section='group'}
</a>
</li>
......
......@@ -10,20 +10,21 @@
{/if}
</h2>
<div>
<div class="fr">
<div class="center" style="width: 50px; height: 50px;"><img src="{$WWWROOT}thumb.php?type=profileicon&amp;maxwidth=100&amp;maxheight=100&amp;id={$USERID}" alt=""></div>
{$introduction}
<div class="fr user-icon">
<img src="{$WWWROOT}thumb.php?type=profileicon&amp;maxwidth=100&amp;maxheight=100&amp;id={$USERID}" alt="">
{if $canmessage}
<br>
<a href="{$WWWROOT}user/sendmessage.php?id={$USERID}&amp;returnto=view">{str tag='sendmessage' section='group'}</a>
<a href="{$WWWROOT}user/sendmessage.php?id={$USERID}&amp;returnto=view" id="btn-sendmessage">{str tag='sendmessage' section='group'}</a>
{/if}
{if $relationship == 'existingfriend'}
<br>
<a href="{$WWWROOT}user/removefriend.php?id={$USERID}&amp;returnto=view">{str tag='removefromfriendslist' section='group'}</a>
<a href="{$WWWROOT}user/removefriend.php?id={$USERID}&amp;returnto=view" id="btn-delete">{str tag='removefromfriendslist' section='group'}</a>
{elseif $relationship == 'none' && $friendscontrol == 'auto'}
{$newfriendform}
{elseif $relationship == 'none' && $friendscontrol == 'auth'}
<br>
<a href="{$WWWROOT}user/requestfriendship.php?id={$USERID}&amp;returnto=view">{str tag='requestfriendship' section='group'}</a>
<a href="{$WWWROOT}user/requestfriendship.php?id={$USERID}&amp;returnto=view" id="btn-request">{str tag='requestfriendship' section='group'}</a>
{/if}
{if $inviteform}
{$inviteform}
......@@ -32,23 +33,24 @@
{$addform}
{/if}
</div>
{$introduction}
<ul id="user-info">
{foreach from=$USERFIELDS name=userfields key=key item=item}
<p><strong>{str section=artefact.internal tag=$key}:</strong> {$item}</p>
<li><label>{str section=artefact.internal tag=$key}:</label> {$item}</li>
{/foreach}
</ul>
{if $relationship == 'pending'}
<div class="message">
{str tag='whymakemeyourfriend' section='group'} {$reason}
{$requestform}
</div>
{/if}
<h6>{str section=mahara tag=views}</h6>
<h3>{str section=mahara tag=views}</h3>
{if $VIEWS}
<table>
<table id="userviewstable">
{foreach from=$VIEWS item=item name=view}
<tr>
<td>
<h6><a href="{$WWWROOT}view/view.php?id={$item->id}">{$item->title|escape}</a></h6>
<td class="r{cycle values=0,1}">
<h4><a href="{$WWWROOT}view/view.php?id={$item->id}">{$item->title|escape}</a></h4>
<span>