latest theme from evonne

htdocs/theme/default/static/style/dev.css

@@ -23,26 +23,8 @@ div#template {
     cursor: move;
 }
 
-span.block, div.block {
-    border: 2px solid transparent;
-    background-color: #c19f88;
-}
-
-span.block_potential, div.block_potential {
-    border: 2px solid #008800;
-}
 
-span.block_targetted, div.block_targetted {
-    border: 2px solid #00ff00;
-}
 
-.moveselected {
-    border: 3px solid #c19f88;
-}
-
-.clickable {
-    cursor: pointer;
-}
 
 /*
  * END MARTYNS STYLES FOR CREATEVIEW WIZARD

htdocs/theme/default/templates/account/watchlist/index.tpl

@@ -22,7 +22,7 @@
 			{/foreach}
 			</select>
 			</form>
-			<p><b><div id="typeheader">{str section='activity' tag='monitored'} {$typestr}</div></b></p>
+			<div id="typeheader">{str section='activity' tag='monitored'} {$typestr}</div>
 			<form method="post" onSubmit="{$stopmonitoring}">
 			<table id="watchlist">
 				<thead>
@@ -30,6 +30,7 @@
 						<th></th>
 						<th>[<a href="" onClick="{$selectall}">{str section='activity' tag='selectall'}</a>]</th>
 						<th id="recurseheader">{$recursestr}</th>
+						<th colspan="2"></th>
 					</tr>
 				</thead>
 				<tbody>

htdocs/theme/default/templates/admin/extensions/pluginconfig.tpl

 {include file='header.tpl'}
 
-<div id="column-full">
-	<div class="content">
-		<div class="box-cnrs"><span class="cnr-tl"><span class="cnr-tr"><span class="cnr-bl"><span class="cnr-br">
-			<div class="maincontent">
+{include file="columnfullstart.tpl"}
 	
 			<h2>Plugin Administration: {$plugintype}: {$pluginname}{if $type}: {$type}{/if}</h2>
 			{$form}
 
-			</div>
-		</span></span></span></span></div>	
-	</div>
-</div>
+{include file="columnfullend.tpl"}
 
 {include file='footer.tpl'}

htdocs/theme/default/templates/admin/extensions/plugins.tpl

 {include file='header.tpl'}
 
-<div id="column-full">
-	<div class="content">
-		<div class="box-cnrs"><span class="cnr-tl"><span class="cnr-tr"><span class="cnr-bl"><span class="cnr-br">
-			<div class="maincontent">
+{include file="columnfullstart.tpl"}
+
 <h2>{str tag='pluginadmin' section='admin'}</h2>
 <ul class="adminpluginstypes">
 {foreach from=$plugins key='plugintype' item='plugins'}
@@ -43,9 +41,7 @@
     </ul>
 {/foreach}
 </ul>
-			</div>
-		</span></span></span></span></div>	
-	</div>
-</div>
+
+{include file="columnfullend.tpl"}
 
 {include file='footer.tpl'}

htdocs/theme/default/templates/admin/extensions/templates.tpl

 {include file='header.tpl'}
-<div id="column-full">
-	<div class="content">
-		<div class="box-cnrs"><span class="cnr-tl"><span class="cnr-tr"><span class="cnr-bl"><span class="cnr-br">
-			<div class="maincontent">
+{include file="columnfullstart.tpl"}
+
 <h2>{str tag='templatesadmin' section='admin'}</h2>
 <table id="admintemplates">
 <tr>
@@ -17,13 +15,13 @@
     <td>{if $template.installed}
         <img id="{$name}.status" alt="{str tag='yes'}" src="{image_path imagelocation='success.gif}" />
 	{if !$template.error}
-            <a href="" onClick="{$installlink}('{$name}'); return false;">{str tag='reinstall' section='admin'}</a> 
+            <a href="" onClick="{$installlink}('{$name}'); return false;" id="admintemplates_reinstall">{str tag='reinstall' section='admin'}</a> 
             <span id="{$name}.message"></span>
  	{/if}
         {else}
         <img id="{$name}.status" alt="{str tag='yes'}" src="{image_path imagelocation='failure.gif}" />
              {if !$template.installed && !$template.error}
-                 <a href="" onClick="{$installlink}('{$name}'); return false;">{str tag='install' section='admin'}</a> 
+                 <a href="" onClick="{$installlink}('{$name}'); return false;" id="admintemplates_install">{str tag='install' section='admin'}</a> 
                  <span id="{$name}.message"></span>
              {/if}
         {/if}
@@ -32,7 +30,8 @@
 </tr>
 {/foreach}
 </table>
- 	</div>
-</div>
+
+
+{include file="columnfullend.tpl"}
 
 {include file='footer.tpl'}

htdocs/theme/default/templates/admin/index.tpl

 {include file='header.tpl'}
 
-<div id="column-full">
-<div class="content">
-<div class="box-cnrs"><span class="cnr-tl"><span class="cnr-tr"><span 
-class="cnr-bl"><span class="cnr-br">
-	<div class="maincontent">
+{include file="columnfullstart.tpl"}
 <h2>{str tag="administration" section=admin}</h2>
 
 <ul>
@@ -38,9 +34,6 @@ class="cnr-bl"><span class="cnr-br">
 <p><a href="upgrade.php">Run upgrade</a></p>
 {/if}
 
-			</div>
-		</span></span></span></span></div>	
-	</div>
-</div>
+{include file="columnfullend.tpl"}
 
 {include file='footer.tpl'}

htdocs/theme/default/templates/admin/installgpl.tpl

 {include file='header.tpl' nosearch=true}
 
-<div id="column-full">
-	<div class="content">
-		<div class="box-cnrs"><span class="cnr-tl"><span class="cnr-tr"><span class="cnr-bl"><span class="cnr-br">
-			<div class="maincontent">
+{include file="columnfullstart.tpl"}
 
 			<h3 class="center"><a href="http://mahara.org">Mahara</a> {str section='admin' tag='release' args=$releaseargs} {str tag='copyright' section='admin'}</h3>
 
@@ -28,9 +25,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA</p>
 
             <form action="{$WWWROOT}admin/upgrade.php" method="post" class="center"><input type="submit" value="{str tag=agreelicense section=admin}" style="font-weight: bold;"></form>
 
-			</div>
-		</span></span></span></span></div>	
-	</div>
-</div>
+{include file="columnfullend.tpl"}
 
 {include file='admin/upgradefooter.tpl'}

htdocs/theme/default/templates/admin/site/menu.tpl

 {include file="header.tpl"}
 
-<div id="column-full">
-	<div class="content">
-		<div class="box-cnrs"><span class="cnr-tl"><span class="cnr-tr"><span class="cnr-bl"><span class="cnr-br">
-			<div class="maincontent">
+{include file="columnfullstart.tpl"}
 	
 			<h2>{str section=admin tag=editmenus}</h2>
 			
@@ -20,9 +17,6 @@
 			
 			</div>
 
-			</div>
-		</span></span></span></span></div>	
-	</div>
-</div>
+{include file="columnfullend.tpl"}
 
 {include file="footer.tpl"}

htdocs/theme/default/templates/admin/site/options.tpl

 {include file="header.tpl"}
 
-<div id="column-full">
-<div class="content">
-<div class="box-cnrs"><span class="cnr-tl"><span class="cnr-tr"><span 
-class="cnr-bl"><span class="cnr-br">
-	<div class="maincontent">
+{include file="columnfullstart.tpl"}
 	
 <h2>{str section=admin tag=siteoptions}</h2>
 
 {$SITEOPTIONFORM}
 
-	</div>
-</span></span></span></span></div>	
-</div>
-</div>
+{include file="columnfullend.tpl"}
+
 {include file="footer.tpl"}

htdocs/theme/default/templates/admin/site/pages.tpl

 {include file="header.tpl"}
 
-<div id="column-full">
-	<div class="content">
-		<div class="box-cnrs"><span class="cnr-tl"><span class="cnr-tr"><span class="cnr-bl"><span class="cnr-br">
-			<div class="maincontent">
+{include file="columnfullstart.tpl"}
 	
 			<h2>{str section=admin tag=editsitecontent}</h2>
 	
 			{$pageeditform}
 
-			</div>
-		</span></span></span></span></div>	
-	</div>
-</div>
+{include file="columnfullend.tpl"}
 
 {include file="footer.tpl"}

htdocs/theme/default/templates/admin/upgrade.tpl

 {include file='header.tpl' nosearch='true'}
 
-<div id="column-full">
-	<div class="content">
-		<div class="box-cnrs"><span class="cnr-tl"><span class="cnr-tr"><span class="cnr-bl"><span class="cnr-br">
-			<div class="maincontent">
+{include file="columnfullstart.tpl"}
 	
             <h2 class="center">{str tag=performinginstallsandupgrades section=admin}</h2>
 			<table cellspacing="0" cellpadding="1" id="installer">
@@ -36,9 +33,6 @@
 			</table>
 			<div id="finished" style="visibility: hidden; margin-top: 1em; text-align: center;">{str section=admin tag=successfullyinstalled} <a href="{$WWWROOT}">{str section=admin tag=continue}</a></div>
 
-			</div>
-		</span></span></span></span></div>	
-	</div>
-</div>
+{include file="columnfullend.tpl"}
 
 {include file='admin/upgradefooter.tpl'}

htdocs/theme/default/templates/admin/users/admin.tpl

 {include file="header.tpl"}
 
-<div id="column-full">
-	<div class="content">
-		<div class="box-cnrs"><span class="cnr-tl"><span class="cnr-tr"><span class="cnr-bl"><span class="cnr-br">
-			<div class="maincontent">
+{include file="columnfullstart.tpl"}
 			<h2>{str tag="adminusers" section="admin"}</h2>
 
 			<p>{str tag="adminusersdescription" section="admin"}</p>
 
 			{$adminusersform}
 
-			</div>
-		</span></span></span></span></div>	
-	</div>
-</div>
+{include file="columnfullend.tpl"}
 
 {include file="footer.tpl"}

htdocs/theme/default/templates/admin/users/institutions.tpl

 {include file="header.tpl"}
 
-<div id="column-full">
-	<div class="content">
-		<div class="box-cnrs"><span class="cnr-tl"><span class="cnr-tr"><span class="cnr-bl"><span class="cnr-br">
-			<div class="maincontent">
+{include file="columnfullstart.tpl"}
 	
 			<h2>AdminInstitutions</h2>
 			
@@ -38,8 +35,8 @@
 					<td>
 						<form action="" method="post">
 							<input type="hidden" name="i" value="{$institution->name}">
-							<input type="submit" name="edit" value="{str tag="edit"}">
-							{if !$institution->hasmembers && $institution->name != 'mahara'}<input type="submit" name="delete" value="{str tag="delete"}">{/if}
+							<input type="submit" name="edit" value="{str tag="edit"}" id="admininstitution_edit">
+							{if !$institution->hasmembers && $institution->name != 'mahara'}<input type="submit" name="delete" value="{str tag="delete"}" id="admininstitution_delete">{/if}
 						</form>
 					</td>
 				</tr>
@@ -47,7 +44,7 @@
 				<tr>
 					<td colspan="4">
 						<form action="" method="post">
-							<input type="submit" name="add" value="{str tag="addinstitution" section="admin"}">
+							<input type="submit" name="add" value="{str tag="addinstitution" section="admin"}" id="admininstitution_add">
 						</form>
 					</td>
 				</tr>
@@ -57,9 +54,6 @@
 			
 			{/if}
 
-			</div>
-		</span></span></span></span></div>	
-	</div>
-</div>
+{include file="columnfullend.tpl"}
 
 {include file="footer.tpl"}

htdocs/theme/default/templates/admin/users/notifications.tpl

 {include file="header.tpl"}
 
-{include file="columnleftstart.tpl"}
+{include file="columnfullstart.tpl"}
 			<h2>{str tag='adminnotifications' section='admin'}</h2>
 
                         {$form}
-{include file="columnleftend.tpl"}
+{include file="columnfullend.tpl"}
 
 {include file="footer.tpl"}

htdocs/theme/default/templates/admin/users/staff.tpl

 {include file="header.tpl"}
 
-<div id="column-full">
-	<div class="content">
-		<div class="box-cnrs"><span class="cnr-tl"><span class="cnr-tr"><span class="cnr-bl"><span class="cnr-br">
-			<div class="maincontent">
+{include file="columnfullstart.tpl"}
 			<h2>{str tag="staffusers" section="admin"}</h2>
 
 			<p>{str tag="staffusersdescription" section="admin"}</p>
 
 			{$staffusersform}
 
-			</div>
-		</span></span></span></span></div>	
-	</div>
-</div>
+{include file="columnfullend.tpl"}
 
 {include file="footer.tpl"}

htdocs/theme/default/templates/admin/users/suspended.tpl

 {include file="header.tpl"}
 
-<div id="column-full">
-	<div class="content">
-		<div class="box-cnrs"><span class="cnr-tl"><span class="cnr-tr"><span class="cnr-bl"><span class="cnr-br">
-			<div class="maincontent">
+{include file="columnfullstart.tpl"}
 			<h2>{str tag=suspendedusers section=admin}</h2>
 
             {$buttonformopen}
@@ -24,9 +21,6 @@
             </table>
             </form>
 
-			</div>
-		</span></span></span></span></div>	
-	</div>
-</div>
+{include file="columnfullend.tpl"}
 
 {include file="footer.tpl"}

htdocs/theme/default/templates/admin/users/uploadcsv.tpl

 {include file="header.tpl"}
 
-<div id="column-full">
-	<div class="content">
-		<div class="box-cnrs"><span class="cnr-tl"><span class="cnr-tr"><span class="cnr-bl"><span class="cnr-br">
-			<div class="maincontent">
+{include file="columnfullstart.tpl"}
 			<h2>{str tag="uploadcsvfile" section="admin"}</h2>
 
 			<p>{str tag="uploadcsvfiledescription" section="admin"}</p>
 
 			{$uploadcsvform}
 
-			</div>
-		</span></span></span></span></div>	
-	</div>
-</div>
+{include file="columnfullend.tpl"}
 
 {include file="footer.tpl"}

htdocs/theme/default/templates/columnfullend.tpl

+                </div>
+            </div></div></div></div>
+        </div>
+    </div>
+</div>

htdocs/theme/default/templates/columnfullstart.tpl

+<div id="column-full">
+    <div class="content">
+        <div class="box-cnrs"><div class="cnr-tl"><div class="cnr-tr"><div class="cnr-bl"><div class="cnr-br">
+            <div class="maincontent">
+                {if $PAGEHELPNAME} <div id="{$PAGEHELPNAME}_container" class="pagehelpicon">{$PAGEHELPICON}</div>{/if}

htdocs/theme/default/templates/contacts/communities/index.tpl

@@ -10,7 +10,7 @@
 	                        <thead>
                                     <tr>
  	                                <th>{str tag='name'}</th>
- 	                                <td></td>
+ 	                                <th>Delete</th>
                                     <tr>
                                 </thead>
                                 <tbody>

htdocs/theme/default/templates/contacts/communities/owned.tpl

@@ -13,7 +13,7 @@
                                     <tr>
  	                                <th>{str tag='name'}</th>
  	                                <th>{str tag='communitymemberrequests'}</th>
- 	                                <td></td>
+ 	                                <th></th>
                                     <tr>
                                 </thead>
                                 <tbody>

htdocs/theme/default/templates/contacts/communities/view.tpl

@@ -59,7 +59,7 @@
                              </tbody>
                          </table>
 	                 {if $tutor}
-                             <input type="button" value="{str tag='updatemembership'}" onClick="return updateMembership();" />
+                             <input type="button" value="{str tag='updatemembership'}" onClick="return updateMembership();" / id="communitymembers_update">
                          {/if}
                      </div>
                 {/if}

htdocs/theme/default/templates/contacts/groups/index.tpl

@@ -5,13 +5,16 @@
 {include file="columnleftstart.tpl"}
     		<h2>{str tag="mygroups"}</h2>
 
-    		<div id="mygroups"><a href="create.php" id="addnewgroup">{str tag="creategroup"}</a>
+    		<div id="mygroups">
+			
+				<div id="addnewgroupdiv"><a href=