Commit 7e9037c7 authored by Evonne Cheung's avatar Evonne Cheung Committed by Hugh Davenport
Browse files

theme/raw: Theme update



Responsive theme

Bug #1041645

Change-Id: Idc2395741875c83fc8b3f64e6d7006288b3b1c00
Signed-off-by: default avatarHugh Davenport <hugh@catalyst.net.nz>
parent 2779df3b
......@@ -9,21 +9,21 @@
</li>
<li class="leavegroup">
{if $group->canleave}
<a href ="{$WWWROOT}group/leave.php?id={$group->id}&amp;returnto={$returnto}" class="btn-leavegroup"><span class="icon">{str tag="leavegroup" section="group"}</span></a>
<a href ="{$WWWROOT}group/leave.php?id={$group->id}&amp;returnto={$returnto}" class="btn-leavegroup"><span class="btn-leavegroup">{str tag="leavegroup" section="group"}</span></a>
{/if}
{if $group->invitefriends}
<a href ="{$WWWROOT}group/inviteusers.php?id={$group->id}&friends=1" class="btn"><span class="icon">{str tag="invitefriends" section="group"}</span></a>
<a href ="{$WWWROOT}group/inviteusers.php?id={$group->id}&friends=1" class="btn"><span class="btn-friend">{str tag="invitefriends" section="group"}</span></a>
{elseif $group->suggestfriends && ($group->request || $group->jointype == 'open')}
<a href ="{$WWWROOT}group/suggest.php?id={$group->id}" class="btn"><span class="icon">{str tag="suggesttofriends" section="group"}</span></a>
{/if}
</li>
{elseif $group->membershiptype == 'admin'}
<li class="admincontrol"><a href="{$WWWROOT}group/edit.php?id={$group->id}" title="{str tag=edit}" class="btn-editgroup"><span class="icon">{str tag=edit}</span></a>
<a href="{$WWWROOT}group/delete.php?id={$group->id}" title="{str tag=delete}" class="btn-deletegroup"><span class="icon">{str tag=delete}</span></a></li>
<li class="admincontrol"><a href="{$WWWROOT}group/edit.php?id={$group->id}" title="{str tag=edit}" class="btn-editgroup"><span class="btn-edit">{str tag=edit}</span></a>
<a href="{$WWWROOT}group/delete.php?id={$group->id}" title="{str tag=delete}" class="btn-deletegroup"><span class="btn-del">{str tag=delete}</span></a></li>
{if $group->requests}
<li class="requestspending">
<a href="{$WWWROOT}group/members.php?id={$group->id}&amp;membershiptype=request" class="btn-membershiprequests"><span class="icon">{str tag="membershiprequests" section="group"} ({$group->requests})</span></a>
<a href="{$WWWROOT}group/members.php?id={$group->id}&amp;membershiptype=request" class="btn-membershiprequests"><span class="btn-pending">{str tag="membershiprequests" section="group"} ({$group->requests})</span></a>
</li>
{/if}
......@@ -44,7 +44,7 @@
{elseif $group->membershiptype == 'request'}
<li class="requestedtojoin">{str tag="requestedtojoin" section="group"}</li>
{elseif $group->request}
<li class="requesttojoin"><a href="{$WWWROOT}group/requestjoin.php?id={$group->id}&amp;returnto={$returnto}" class="btn-request"><span class="icon">{str tag="requestjoingroup" section="group"}</span></a></li>
<li class="requesttojoin"><a href="{$WWWROOT}group/requestjoin.php?id={$group->id}&amp;returnto={$returnto}" class="btn-request"><span class="btn-request">{str tag="requestjoingroup" section="group"}</span></a></li>
{elseif $group->jointype == 'controlled'}
<li class="controlled">{str tag="membershipcontrolled" section="group"}</li>
{else}
......
......@@ -4,12 +4,12 @@
{foreach from=$row item=r}
<td>
<div class="fl membericon"><img src="{profile_icon_url user=$r maxwidth=40 maxheight=40}" alt=""></div>
<h3><a href="{profile_url($r)}">{$r.name}</a></h3>
<h4><a href="{profile_url($r)}">{$r.name}</a></h4>
{if $r.role}
<div class="rel">
<div class="removemember">{$r.removeform|safe}</div>
<strong>{$results.roles[$r.role]->display}</strong>
{if $caneditroles && $r.canchangerole} (<a href="{$WWWROOT}group/changerole.php?group={$group}&amp;user={$r.id}">{str tag=changerole section=group}</a>){/if}
<div class="removemember">{$r.removeform|safe}</div>
<div>{$r.introduction|str_shorten_html:80:true|safe}</div>
<label>{str tag="Joined" section="group"}:</label> {$r.jointime}
</div>
......
......@@ -8,9 +8,7 @@
{if $groups}<table id="mygroups" class="fullwidth listing">
{foreach from=$groups item=group}
<tr><td class="{cycle values='r0,r1'}">
<div class="fr">
{include file="group/groupuserstatus.tpl" group=$group returnto='find'}
</div>
{include file="group/groupuserstatus.tpl" group=$group returnto='find'}
<div class="mygroupsdetails">
{include file="group/group.tpl" group=$group returnto='mygroups'}
</div>
......
{foreach from=$topics item=topic}
<tr class="{cycle values='r0,r1'}">
<td>
<div class="topictitle"><a href="{$WWWROOT}interaction/forum/topic.php?id={$topic->id}">{$topic->topicname|str_shorten_text:65:true}</a></div>
<h4><a href="{$WWWROOT}interaction/forum/topic.php?id={$topic->id}">{$topic->topicname|str_shorten_text:65:true}</a></h4>
<div class="s">
<a href="{$topic->groupurl}" class="topicgroup">{$topic->groupname|str_shorten_text:30:true}</a> >
<a href="{$WWWROOT}interaction/forum/view.php?id={$topic->forumid}" class="topicforum">{$topic->forumname|str_shorten_text:30:true}</a>
......@@ -9,9 +9,9 @@
</td>
<td class="center">{$topic->postcount}</td>
<td>
<div class="s">{$topic->body|str_shorten_html:80:true|strip_tags|safe}</div>
<span class="s poster"><a href="{profile_url($topic->poster)}">{$topic->poster|display_name}</a></span>
<span class="postedon nowrap"> - {$topic->ctime|strtotime|format_date:'strftimerecent'}</span>
<div class="s">"{$topic->body|str_shorten_html:80:true|strip_tags|safe}"</div>
<span class="s poster"><a href="{profile_url($topic->poster)}">{$topic->poster|display_name}</a> - </span>
<span class="postedon nowrap">{$topic->ctime|strtotime|format_date:'strftimerecent'}</span>
</td>
</tr>
{/foreach}
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html{if $LANGDIRECTION == 'rtl'} dir="rtl"{/if}>
<!--[if lt IE 7 ]><html{if $LANGDIRECTION == 'rtl'} dir="rtl"{/if} class="ie ie6"><![endif]-->
<!--[if IE 7 ]><html{if $LANGDIRECTION == 'rtl'} dir="rtl"{/if} class="ie ie7"><![endif]-->
<!--[if IE 8 ]><html{if $LANGDIRECTION == 'rtl'} dir="rtl"{/if} class="ie ie8"><![endif]-->
<!--[if IE 9 ]><html{if $LANGDIRECTION == 'rtl'} dir="rtl"{/if} class="ie ie9"><![endif]-->
<!--[if (gt IE 9)|!(IE)]><!--><html{if $LANGDIRECTION == 'rtl'} dir="rtl"{/if}><!--<![endif]-->
{include file="header/head.tpl"}
<body>
{if $USERMASQUERADING || !$PRODUCTIONMODE || $SITECLOSED || $SITETOP}<div class="sitemessages">{/if}
......@@ -12,24 +16,15 @@
<div id="loading-box"></div>
<div id="top-wrapper"><h1 id="site-logo"><a href="{$WWWROOT}"><img src="{$sitelogo}" alt="{$sitename}"></a></h1>
{include file="header/topright.tpl"}
{if $DROPDOWNMENU}
{include file="header/dropdown.tpl"}
{else}
{include file="header/navigation.tpl"}
{/if}
<div class="cb"></div>
</div>
<div id="mainmiddle">
<div id="main-wrapper">
{if $SIDEBARS && $SIDEBLOCKS.left}
<div id="left-column" class="sidebar">
{include file="sidebar.tpl" blocks=$SIDEBLOCKS.left}
</div>
{/if}
<div id="main-column" class="main-column{if $SIDEBARS} main-column-narrow {if $SIDEBLOCKS.right}fl{else}fr{/if}{/if}">
{dynamic}{insert_messages}{/dynamic}
<div id="main-column-container">
<div id="mainmiddlewrap">
<div id="mainmiddle">
<div id="{if $SIDEBARS}{if $SIDEBLOCKS.right}main-wrapper-narrow-right{else}main-wrapper-narrow-left{/if}{else}main-wrapper{/if}">
<div id="main-column" class="main-column{if $SIDEBARS} main-column-narrow{/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>
{/if}
......
{if $MAINNAV}
<div id="main-nav" class="dropdown-main">
<ul id="dropdown-nav">
{strip}
{foreach from=$MAINNAV item=item}
{if $item.weight == 10}
<li class="{if $item.selected}selected{/if} dropdown-nav-home"{if $item.accesskey} id="{$item.accesskey}"{/if}><span>
<a href="{$WWWROOT}{$item.url}"{if $item.accesskey} accesskey="{$item.accesskey}"{/if} class="{if $item.path}{$item.path}{else}dashboard{/if}">{$item.title}</a></span>
{else}
<li{if $item.accesskey} id="{$item.accesskey}"{/if} {if $item.selected} class="selected"{/if}><span>
<a href="{$WWWROOT}{$item.url}"{if $item.accesskey} accesskey="{$item.accesskey}"{/if} class="{if $item.path}{$item.path}{else}dashboard{/if}">{$item.title}</a></span>
{/if}
{if $item.submenu}
<ul class="dropdown-sub">
{strip}
{foreach from=$item.submenu item=subitem}
<li><span>
<a href="{$WWWROOT}{$subitem.url}"{if $subitem.accesskey} accesskey="{$subitem.accesskey}"{/if}>{$subitem.title}</a>
</span></li>
{/foreach}
{/strip}
</ul>
{/if}
</li>
{/foreach}
{if $ADMIN || $INSTITUTIONALADMIN || $STAFF || $INSTITUTIONALSTAFF}
<li><span><a href="{$WWWROOT}" accesskey="h" class="return-site">{str tag="returntosite"}</a></span></li>
{elseif $USER->get('admin')}
<li><span><a href="{$WWWROOT}admin/" accesskey="a" class="admin-site">{str tag="siteadministration"}</a></span></li>
{elseif $USER->is_institutional_admin()}
<li><span><a href="{$WWWROOT}admin/users/search.php" accesskey="a" class="admin-user">{str tag="institutionadministration"}</a></span></li>
{elseif $USER->get('staff')}
<li><span><a href="{$WWWROOT}admin/users/search.php" accesskey="a" class="admin-user">{str tag="siteinformation"}</a></span></li>
{elseif $USER->is_institutional_staff()}
<li><span><a href="{$WWWROOT}admin/users/search.php" accesskey="a" class="admin-user">{str tag="institutioninformation"}</a></span></li>
{/if}
{/strip}
</ul>
</div>
{/if}
......@@ -26,17 +26,12 @@
{$INLINEJAVASCRIPT|safe}
</script>
{/if}
<!--[if lt IE 7.]>
<script defer type="text/javascript" src="{$WWWROOT}js/pngfix.js"></script>
<![endif]-->
{foreach from=$STYLESHEETLIST item=cssurl}
<link rel="stylesheet" type="text/css" href="{$cssurl}">
{/foreach}
<link rel="stylesheet" type="text/css" href="{theme_url filename='style/print.css'}" media="print">
{if $DROPDOWNMENU}
<link rel="stylesheet" type="text/css" href="{theme_url filename='style/dropdown.css'}">
{/if}
<script type="text/javascript" src="{$WWWROOT}js/css.js"></script>
<link rel="shortcut icon" href="{$WWWROOT}favicon.ico" type="image/vnd.microsoft.icon">
<link rel="image_src" href="{$sitelogo}" />
</head>
{dynamic}{flush}{/dynamic}
{if $MAINNAV}
<div id="main-nav">
<ul>{strip}
<div id="main-nav" class="{if $ADMIN || $INSTITUTIONALADMIN || $STAFF || $INSTITUTIONALSTAFF}{if $DROPDOWNMENU}dropdown-adminnav {else}adminnav {/if}{/if}main-nav">
<ul id="{if $DROPDOWNMENU}dropdown-nav{else}nav{/if}">
{strip}
{foreach from=$MAINNAV item=item}
<li{if $item.selected} class="selected"{/if}><span><a href="{$WWWROOT}{$item.url}"{if $item.accesskey} accesskey="{$item.accesskey}"{/if} class="{if $item.path}{$item.path}{else}dashboard{/if}">{$item.title}</a></span></li>
<li class="{if $item.path}{$item.path}{else}dashboard{/if}{if $item.selected} selected{/if}{if $DROPDOWNMENU} dropdown-nav-home{/if}"><span><a href="{$WWWROOT}{$item.url}"{if $item.accesskey} accesskey="{$item.accesskey}"{/if} class="{if $item.path}{$item.path}{else}dashboard{/if}">{$item.title}</a></span>
{if $DROPDOWNMENU}{if $item.submenu}
<ul class="dropdown-sub">
{strip}
{foreach from=$item.submenu item=subitem}
<li{if $subitem.selected} class="selected"{/if}><span>
<a href="{$WWWROOT}{$subitem.url}"{if $subitem.accesskey} accesskey="{$subitem.accesskey}"{/if}>{$subitem.title}</a>
</span></li>
{/foreach}
{/strip}
<div class="cl"></div>
</ul>
{/if}{/if}
</li>
{/foreach}
{if $ADMIN || $INSTITUTIONALADMIN || $STAFF || $INSTITUTIONALSTAFF}
<li class="returntosite"><span><a href="{$WWWROOT}" accesskey="h" class="return-site">{str tag="returntosite"}</a></span></li>
{elseif $USER->get('admin') && !$MOBILE}
{elseif $USER->get('admin')}
<li class="siteadmin"><span><a href="{$WWWROOT}admin/" accesskey="a" class="admin-site">{str tag="siteadministration"}</a></span></li>
{elseif $USER->is_institutional_admin() && !$MOBILE}
{elseif $USER->is_institutional_admin()}
<li class="instituteadmin"><span><a href="{$WWWROOT}admin/users/search.php" accesskey="a" class="admin-user">{str tag="institutionadministration"}</a></span></li>
{elseif $USER->get('staff')}
<li><span><a href="{$WWWROOT}admin/users/search.php" accesskey="a" class="admin-user">{str tag="siteinformation"}</a></span></li>
<li class="siteinfo"><span><a href="{$WWWROOT}admin/users/search.php" accesskey="a" class="admin-user">{str tag="siteinformation"}</a></span></li>
{elseif $USER->is_institutional_staff()}
<li><span><a href="{$WWWROOT}admin/users/search.php" accesskey="a" class="admin-user">{str tag="institutioninformation"}</a></span></li>
<li class="instituteinfo"><span><a href="{$WWWROOT}admin/users/search.php" accesskey="a" class="admin-user">{str tag="institutioninformation"}</a></span></li>
{/if}
{/strip}</ul>
</div>
</div>
{if $DROPDOWNMENU}
{else}
<div id="sub-nav">
{if $SELECTEDSUBNAV}
<ul>{strip}
<ul>
{strip}
{foreach from=$SELECTEDSUBNAV item=item}
<li{if $item.selected} class="selected"{/if}><a href="{$WWWROOT}{$item.url}"{if $item.accesskey} accesskey="{$item.accesskey}"{/if}>{$item.title}</a></li>
<li{if $item.selected} class="selected"{/if}><span><a href="{$WWWROOT}{$item.url}"{if $item.accesskey} accesskey="{$item.accesskey}"{/if}>{$item.title}</a></span></li>
{/foreach}
{/strip}</ul>
{/if}
<div class="cb"></div>
</div>
{/if}
{/if}
<div id="header-right">
<div id="right-nav">
<ul>{strip}
{if $LOGGEDIN} <li class="identity"><a href="{profile_url($USER)}">{$USER|display_default_name}</a> | </li>{/if}
{if $LOGGEDIN} <li class="identity"><a href="{profile_url($USER)}">{$USER|display_default_name}</a></li>{/if}
{if $RIGHTNAV}
{foreach from=$RIGHTNAV item=item}
<li class="{$item.path}{if $item.selected}{assign var=MAINNAVSELECTED value=$item} selected{/if}"><a href="{if $item.wwwroot}{$item.wwwroot}{else}{$WWWROOT}{/if}{$item.url}">{if $item.title}{$item.title}{/if}{if $item.icon}<img src="{$item.icon}" alt="{$item.alt}">{if isset($item.count)}<span class="navcount{if $item.countclass} {$item.countclass}{/if}">{$item.count}</span>{/if}</a> | </li>
<li class="{$item.path}{if $item.selected}{assign var=MAINNAVSELECTED value=$item} selected{/if}"> | <a href="{if $item.wwwroot}{$item.wwwroot}{else}{$WWWROOT}{/if}{$item.url}">{if $item.title}{$item.title}{/if}{if $item.icon}<img src="{$item.icon}" alt="{$item.alt}">{if isset($item.count)}<span class="navcount{if $item.countclass} {$item.countclass}{/if}">{$item.count}</span>{/if}</a></li>
{/foreach}
<li class="btn-logout"><a href="{$WWWROOT}?logout" accesskey="l">{str tag="logout"}</a></li>
<li class="btn-logout"> | <a href="{$WWWROOT}?logout" accesskey="l">{str tag="logout"}</a></li>
{/if}
{/strip}
{if !$nosearch && !$LOGGEDIN && $languageform}
......
<div id="home-info-container">
{if $USER->is_logged_in()}<div id="hideinfo" class="nojs-hidden-block"><a title="{str tag=Hide}"><img src="{theme_url filename='images/icon_close.gif'}" alt="[x]" /></a></div>{/if}
<table id="home-info" class="home-info-table{if $USER->is_logged_in()} loggedin{/if}">
<tr>
<td>
......@@ -63,7 +64,6 @@
</div>
</td>
<td>
{if $USER->is_logged_in()}<div id="hideinfo" class="nojs-hidden-block"><a title="{str tag=Hide}"><img src="{theme_url filename='images/icon_close.gif'}" alt="[x]" /></a></div>{/if}
<div class="home-info home-info-3">
<div class="home-info-inner">
<h3>{str tag=sharenetwork}</h3>
......
<td class="staffinfo">
<div class="peoplelistinfo">
<div class="leftdiv" id="staffinfo_{$user->id}">
<img src="{profile_icon_url user=$user maxwidth=40 maxheight=40}" alt="">
</div>
<div class="rightdiv">
<h3>
<a href="{profile_url($user)}">{$user->display_name}</a>
</h3>
</div>
</div>
</td>
<td class="staffinfo actionlisttd">
{if $USER->get('id') != $user->id}
{if $user->messages && $listtype == 'admin'}
<ul class="actionlist">
......@@ -10,14 +23,4 @@
</ul>
{/if}
{/if}
<div class="leftdiv" id="staffinfo_{$user->id}">
<img src="{profile_icon_url user=$user maxwidth=40 maxheight=40}" alt="">
</div>
<div class="rightdiv">
<h3>
<a href="{profile_url($user)}">{$user->display_name}</a>
</h3>
</div>
</td>
</div>{* main-column-container *}
</div>{* main-column *}
</div>{* main-wrapper *}
</div><!-- end main-column-container -->
</div><!-- end main-column -->
</div><!-- end main-wrapper -->
</div><!-- end mainmiddle -->
</div><!-- end mainmiddlewrap -->
<div id="footer-wrap">
{mahara_performance_info}
<div id="footer">
{mahara_performance_info}
</div>
</div>
</div>{* containerX *}
</body>
......
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html{if $LANGDIRECTION == 'rtl'} dir="rtl"{/if}>
<!--[if lt IE 7 ]><html{if $LANGDIRECTION == 'rtl'} dir="rtl"{/if} class="ie ie6"><![endif]-->
<!--[if IE 7 ]><html{if $LANGDIRECTION == 'rtl'} dir="rtl"{/if} class="ie ie7"><![endif]-->
<!--[if IE 8 ]><html{if $LANGDIRECTION == 'rtl'} dir="rtl"{/if} class="ie ie8"><![endif]-->
<!--[if IE 9 ]><html{if $LANGDIRECTION == 'rtl'} dir="rtl"{/if} class="ie ie9"><![endif]-->
<!--[if (gt IE 9)|!(IE)]><!--><html{if $LANGDIRECTION == 'rtl'} dir="rtl"{/if}><!--<![endif]-->
{include file="header/head.tpl"}
<body id="micro">
<div id="containerX">
......@@ -7,9 +11,11 @@
<div id="top-wrapper">
<h1 class="hidden"><a href="{$WWWROOT}">{$hiddenheading|default:"Mahara"|escape}</a></h1>
</div>
<div id="main-wrapper">
<div class="main-column">
{dynamic}{insert_messages}{/dynamic}
<div id="main-column-container">
<div id="mainmiddlewrap">
<div id="mainmiddle">
<div id="main-wrapper">
<div id="main-column" class="main-column">
<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>
{/if}
......@@ -3,7 +3,7 @@
<div class="sidebar-content">
<ul class="cr">
{foreach from=$sbdata.users item=user}
<li><a href="{profile_url($user)}"><div class="profile-icon-container"><img src="{$user->profileiconurl}" alt=""></div>{$user|display_name}</a>{if $user->loggedinfrom} ({$user->loggedinfrom}){/if}</li>
<li><a href="{profile_url($user)}"><img src="{$user->profileiconurl}" alt="" class="profile-icon-container"> {$user|display_name}</a>{if $user->loggedinfrom} ({$user->loggedinfrom}){/if}</li>
{/foreach}
</ul>
<p id="allonline"><a href="{$WWWROOT}user/online.php">{str tag="allonline"}</a></p>
......
......@@ -58,5 +58,4 @@
{/if}
{if $USERMASQUERADING} <div id="changeuser">{$becomeyouagain|safe}</div>
{/if}
<div class="cb"></div>
</div>
......@@ -17,8 +17,8 @@
{/if}
<div id="results_container" class="rel tag-results">
<h3 id="results_heading">{str tag=searchresultsfor} <a class="tag" href="{$WWWROOT}tags.php{if $tag}{$results->queryprefix}tag={$tag|urlencode|safe}{/if}">{if $tag}{$tag|str_shorten_text:50}{else}{str tag=alltags}{/if}</a></h3>
<div class="rbuttons"><a class="btn edit-tag{if !$tag} hidden{/if}" href="{$WWWROOT}edittags.php?tag={$tag|urlencode|safe}">{str tag=editthistag}</a></div>
<h3 id="results_heading">{str tag=searchresultsfor} <a class="tag" href="{$WWWROOT}tags.php{if $tag}{$results->queryprefix}tag={$tag|urlencode|safe}{/if}">{if $tag}{$tag|str_shorten_text:50}{else}{str tag=alltags}{/if}</a></h3>
<div id="results_sort" class="fl">{str tag=sortresultsby}
{foreach from=$results->sortcols item=sortfield name=sortcols}
<a href="{$results->baseurl}{$results->queryprefix}type={$results->filter}&sort={$sortfield}"{if $results->sort == $sortfield} class="selected"{/if}>{str tag=$sortfield}</a>{if !$.foreach.sortcols.last} <span class="sep">|</span>{/if}
......
......@@ -2,6 +2,7 @@
{foreach from=$data item=user}
<tr class="{cycle values='r0,r1'}">
<td class="onlineinfo">
<div class="peoplelistinfo">
<div class="leftdiv" id="onlineinfo_{$user->id}">
<img src="{profile_icon_url user=$user maxwidth=40 maxheight=40}" alt="">
</div>
......@@ -9,6 +10,7 @@
<div class="rightdiv">
<h3><a href="{profile_url($user)}">{$user->display_name}</a></h3>
</div>
</div>
</td>
</tr>
{/foreach}
......
<td class="friendinfo{if $user->pending} pending rel{/if}">
<div class="peoplelistinfo">
<div class="leftdiv" id="friendinfo_{$user->id}">
<img src="{profile_icon_url user=$user maxwidth=40 maxheight=40}" alt="">
</div>
<div class="rightdiv">
<h4><a href="{profile_url($user)}">{$user->display_name}</a>
{if $user->pending}
<span class="pendingfriend"> - {str tag='pending' section='group'}</span>
{elseif $user->friend && $page == 'find'}
<span class="existingfriend"> - {str tag='existingfriend' section='group'}</span>
{/if}
</h4>
{if $user->introduction}<div class="userintro">{$user->introduction|str_shorten_html:100:true|safe}</div>{/if}
{if $user->friend && $page == 'myfriends' && $user->views}
<ul class="viewlist">
<li class="label">
<strong>{str tag='Views' section='group'}</strong>
</li>
{foreach from=$user->views item=view}
<li>
<a href="{$view->fullurl}">{$view->title}</a>
</li>
{/foreach}
</ul>
{/if}
{if $user->pending}
<div class="btn-pending s">
<label>
{str tag='whymakemeyourfriend' section='group'}
</label>
<span>{$user->message|format_whitespace|safe}</span>
</div>
{/if}
</div>
</div>
</td>
<td class="friendinfo{if $user->pending} pending rel{/if} actionlisttd">
<ul class="actionlist">
{if $user->institutions}<li>{$user->institutions|safe}</li>{/if}
{if $user->pending}
<li class="approvefriend">{$user->accept|safe}</li>
<li>
<a href="{$WWWROOT}user/denyrequest.php?id={$user->id}&amp;returnto={$page}" id="btn-denyrequest" class="btn-deny">
<a href="{$WWWROOT}user/denyrequest.php?id={$user->id}&amp;returnto={$page}" class="btn-deny">
{str tag='denyrequest' section='group'}
</a>
</li>
{/if}
{if $user->messages}
<li>
<a href="{$WWWROOT}user/sendmessage.php?id={$user->id}&amp;returnto={$page}" id="btn-sendmessage" class="btn-message">
<a href="{$WWWROOT}user/sendmessage.php?id={$user->id}&amp;returnto={$page}" class="btn-message">
{str tag='sendmessage' section='group'}
</a>
</li>
{/if}
{if $user->friend}
<li>
<a href="{$WWWROOT}user/removefriend.php?id={$user->id}&amp;returnto={$page}" id="btn-del" class="btn-del">
<a href="{$WWWROOT}user/removefriend.php?id={$user->id}&amp;returnto={$page}" class="btn-del">
{str tag='removefromfriendslist' section='group'}
</a>
</li>
......@@ -27,9 +65,9 @@
<i>{str tag='friendshiprequested' section='group'}</i>
</li>
{elseif !$user->pending} {* Not an existing, pending, or requested friend *}
<li>
<li class="friend">
{if $user->friendscontrol == 'auth'}
<a href="{$WWWROOT}user/requestfriendship.php?id={$user->id}&amp;returnto={$page}" id="btn-request" class="btn-request">
<a href="{$WWWROOT}user/requestfriendship.php?id={$user->id}&amp;returnto={$page}" class="btn-request">
{str tag='sendfriendrequest' section='group'}
</a>
{elseif $user->friendscontrol == 'auto'}
......@@ -44,37 +82,4 @@
{/if}
</ul>
<div class="leftdiv" id="friendinfo_{$user->id}">
<img src="{profile_icon_url user=$user maxwidth=40 maxheight=40}" alt="">
</div>
<div class="rightdiv">
<h3>
<a href="{profile_url($user)}">{$user->display_name}</a>
{if $user->pending}- {str tag='pending' section='group'}
{elseif $user->friend && $page == 'find'}- {str tag='existingfriend' section='group'}
{/if}
</h3>
{if $user->friend && $page == 'myfriends' && $user->views}
<ul class="btn-views viewlist">
<li class="label">
<strong>{str tag='Views' section='group'}</strong>
</li>
{foreach from=$user->views item=view}
<li>
<a href="{$view->fullurl}">{$view->title}</a>
</li>
{/foreach}
</ul>
{/if}
{if $user->introduction}<div class="s userintro">{$user->introduction|str_shorten_html:100:true|safe}</div>{/if}
{if $user->pending}
<div class="btn-pending s">
<label>
{str tag='whymakemeyourfriend' section='group'}
</label>
<span>{$user->message|format_whitespace|safe}</span>
</div>
{/if}
</div>
</td>
......@@ -2,14 +2,14 @@
{include file="viewmicroheader.tpl"}
{else}
{include file="header.tpl"}
<table class="user-icon-name"><tr>
<td><img src="{profile_icon_url user=$user maxwidth=60 maxheight=60}" alt="" /></td>
<h1 class="user-icon-name">
<span class="usericon"><img src="{profile_icon_url user=$user maxwidth=60 maxheight=60}" alt="" /></span>
{if $pageheadinghtml}
<td><h1>{$pageheadinghtml|safe}</h1></td>
{$pageheadinghtml|safe}
{/if}
</tr></table>
</h1>
{if $ownprofile && !$MOBILE}
<div class="rbuttons">
<div class="userviewrbuttons">
<a title="{str tag=editthisview section=view}" href="{$WWWROOT}view/blocks.php?profile=1" class="btn">{str tag=editthisview section=view}</a>
</div>
{/if}
......@@ -18,7 +18,7 @@
{if $relationship == 'pending'}
<div class="message">
{str tag='whymakemeyourfriend' section='group'} {$message}
<label>{str tag='whymakemeyourfriend' section='group'}</label>: {$message}
<div>