Commit 35ed0822 authored by Penny Leach's avatar Penny Leach
Browse files

extracted all the column left span span span span div div div crap into

its own templates columnleftstart and columnleftend.  this is a big
noisy commit
parent 509ea4b6
...@@ -9,12 +9,7 @@ ...@@ -9,12 +9,7 @@
<div id="column-right"> <div id="column-right">
{include file="adminmenu.tpl"} {include file="adminmenu.tpl"}
</div> </div>
{include file="columnleftstart.tpl"}
<div id="column-left">
<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">
<h2>{str section="artefact.blog" tag=$pagetitle}</h2> <h2>{str section="artefact.blog" tag=$pagetitle}</h2>
{$textinputform} {$textinputform}
<div id='uploader'></div> <div id='uploader'></div>
...@@ -41,10 +36,5 @@ ...@@ -41,10 +36,5 @@
<input type='button' value='{str tag=savepost section=artefact.blog}' onclick="saveblogpost()"> <input type='button' value='{str tag=savepost section=artefact.blog}' onclick="saveblogpost()">
<input type='button' value='{str tag=cancel}' onclick="canceledit()"> <input type='button' value='{str tag=cancel}' onclick="canceledit()">
</div> </div>
</div> {include file="columnleftend.tpl"}
</span></span></span></span>
</div>
</div>
</div>
{include file="footer.tpl"} {include file="footer.tpl"}
...@@ -11,10 +11,7 @@ ...@@ -11,10 +11,7 @@
{include file="adminmenu.tpl"} {include file="adminmenu.tpl"}
</div> </div>
<div id="column-left"> {include file="columnleftstart.tpl"}
<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">
<div id="myblogs"> <div id="myblogs">
<h2>{str section="artefact.blog" tag="myblogs"}</h2> <h2>{str section="artefact.blog" tag="myblogs"}</h2>
<div class="newblog"> <div class="newblog">
...@@ -37,10 +34,5 @@ ...@@ -37,10 +34,5 @@
</div> </div>
</div> </div>
{include file="columnleftend.tpl"}
</div>
</span></span></span></span></div>
</div>
</div>
{include file="footer.tpl"} {include file="footer.tpl"}
...@@ -9,16 +9,9 @@ ...@@ -9,16 +9,9 @@
<div id="column-right"> <div id="column-right">
{include file="adminmenu.tpl"} {include file="adminmenu.tpl"}
</div> </div>
{include file="columnleftstart.tpl"}
<div id="column-left">
<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">
<h2>{str section="artefact.blog" tag="newblog"}</h2> <h2>{str section="artefact.blog" tag="newblog"}</h2>
{$newblogform} {$newblogform}
</div>
</span></span></span></span></div>
</div>
</div>
{include file="columnleftend.tpl"}
{include file="footer.tpl"} {include file="footer.tpl"}
...@@ -9,18 +9,11 @@ ...@@ -9,18 +9,11 @@
<div id="column-right"> <div id="column-right">
{include file="adminmenu.tpl"} {include file="adminmenu.tpl"}
</div> </div>
{include file="columnleftstart.tpl"}
<div id="column-left">
<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">
<h2>{str section="artefact.blog" tag="newblogpost"}</h2> <h2>{str section="artefact.blog" tag="newblogpost"}</h2>
{$newpostform} {$newpostform}
ADD RADIO BUTTONS ADD RADIO BUTTONS
</div>
</span></span></span></span></div>
</div>
</div>
{include file="columnleftend.tpl"}
{include file="footer.tpl"} {include file="footer.tpl"}
...@@ -3,7 +3,10 @@ ...@@ -3,7 +3,10 @@
This template displays the settings for a user's blog. This template displays the settings for a user's blog.
*}{include file="header.tpl"} *}{include file="header.tpl"}
<div id="column-right">
{include file="adminmenu.tpl"} {include file="adminmenu.tpl"}
</div>
{include file="columnleftstart.tpl"}
<div class="content"> <div class="content">
<h2>{str section="artefact.blog" tag="blogsettings"}</h2> <h2>{str section="artefact.blog" tag="blogsettings"}</h2>
...@@ -14,3 +17,6 @@ ...@@ -14,3 +17,6 @@
{$editform} {$editform}
</div> </div>
{include file="columnleftend.tpl"}
{include file="footer.tpl"}
...@@ -10,10 +10,7 @@ ...@@ -10,10 +10,7 @@
{include file="adminmenu.tpl"} {include file="adminmenu.tpl"}
</div> </div>
<div id="column-left"> {include file="columnleftstart.tpl"}
<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">
<h2>{str section="artefact.blog" tag="viewblog"} - {$blog->get('title')|escape}</h2> <h2>{str section="artefact.blog" tag="viewblog"} - {$blog->get('title')|escape}</h2>
<div id="myblogs"> <div id="myblogs">
...@@ -38,9 +35,5 @@ ...@@ -38,9 +35,5 @@
</div> </div>
</div> {include file="columnleftend.tpl"}
</span></span></span></span></div>
</div>
</div>
{include file="footer.tpl"} {include file="footer.tpl"}
...@@ -4,10 +4,7 @@ ...@@ -4,10 +4,7 @@
{include file="adminmenu.tpl"} {include file="adminmenu.tpl"}
</div> </div>
<div id="column-left"> {include file="columnleftstart.tpl"}
<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">
<h2>{str section="artefact.file" tag="myfiles"}</h2> <h2>{str section="artefact.file" tag="myfiles"}</h2>
<div id="myfiles"> <div id="myfiles">
<div id="uploader"></div> <div id="uploader"></div>
...@@ -22,9 +19,5 @@ ...@@ -22,9 +19,5 @@
<tbody><tr><th></th></tr></tbody> <tbody><tr><th></th></tr></tbody>
</table> </table>
</div> </div>
</div> {include file="columnleftend.tpl"}
</span></span></span></span></div>
</div>
</div>
{include file="footer.tpl"} {include file="footer.tpl"}
...@@ -3,17 +3,8 @@ ...@@ -3,17 +3,8 @@
<div id="column-right"> <div id="column-right">
{include file="adminmenu.tpl"} {include file="adminmenu.tpl"}
</div> </div>
{include file="columnleftstart.tpl"}
<div id="column-left">
<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">
<h2>{str section="artefact.internal" tag="profile"}</h2> <h2>{str section="artefact.internal" tag="profile"}</h2>
{$profileform} {$profileform}
{include file="columnleftend.tpl"}
</div>
</span></span></span></span></div>
</div>
</div>
{include file="footer.tpl"} {include file="footer.tpl"}
...@@ -3,18 +3,10 @@ ...@@ -3,18 +3,10 @@
<div id="column-right"> <div id="column-right">
{include file="adminmenu.tpl"} {include file="adminmenu.tpl"}
</div> </div>
{include file="columnleftstart.tpl"}
<div id="column-left">
<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">
<h2>{str section="artefact.internal" tag="emailactivation"}</h2> <h2>{str section="artefact.internal" tag="emailactivation"}</h2>
<p> <p>
{$message|escape} {$message|escape}
</p> </p>
</div> {include file="columnleftend.tpl"}
</span></span></span></span></div>
</div>
</div>
{include file="footer.tpl"} {include file="footer.tpl"}
...@@ -4,11 +4,7 @@ ...@@ -4,11 +4,7 @@
{include file="adminmenu.tpl"} {include file="adminmenu.tpl"}
</div> </div>
<div id="column-left"> {include file="columnleftstart.tpl"}
<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">
<h2>{str tag="activity"}</h2> <h2>{str tag="activity"}</h2>
<div id="recentactivity"> <div id="recentactivity">
...@@ -48,9 +44,5 @@ ...@@ -48,9 +44,5 @@
</form> </form>
</div> </div>
</div> {include file="columnleftend.tpl"}
</span></span></span></span></div>
</div>
</div>
{include file="footer.tpl"} {include file="footer.tpl"}
...@@ -4,18 +4,10 @@ ...@@ -4,18 +4,10 @@
{include file="adminmenu.tpl"} {include file="adminmenu.tpl"}
</div> </div>
<div id="column-left"> {include file="columnleftstart.tpl"}
<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">
<h2>{str tag="activityprefs"}</h2> <h2>{str tag="activityprefs"}</h2>
{$prefsdescr} {$prefsdescr}
{$form} {$form}
{include file="columnleftend.tpl"}
</div>
</span></span></span></span></div>
</div>
</div>
{include file="footer.tpl"} {include file="footer.tpl"}
...@@ -4,18 +4,9 @@ ...@@ -4,18 +4,9 @@
{include file="adminmenu.tpl"} {include file="adminmenu.tpl"}
</div> </div>
<div id="column-left"> {include file="columnleftstart.tpl"}
<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">
<h2>{str tag="preferences"}</h2> <h2>{str tag="preferences"}</h2>
{$form} {$form}
{include file="columnleftend.tpl"}
</div>
</span></span></span></span></div>
</div>
</div>
{include file="footer.tpl"} {include file="footer.tpl"}
...@@ -4,11 +4,7 @@ ...@@ -4,11 +4,7 @@
{include file="adminmenu.tpl"} {include file="adminmenu.tpl"}
</div> </div>
<div id="column-left"> {include file="columnleftstart.tpl"}
<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">
<h2>{str tag="watchlist"}</h2> <h2>{str tag="watchlist"}</h2>
<div id="mywatchlist"> <div id="mywatchlist">
<form method="post"> <form method="post">
...@@ -48,10 +44,6 @@ ...@@ -48,10 +44,6 @@
</table> </table>
</form> </form>
</div> </div>
{include file="columnleftend.tpl"}
</div>
</span></span></span></span></div>
</div>
</div>
{include file="footer.tpl"} {include file="footer.tpl"}
...@@ -3,11 +3,7 @@ ...@@ -3,11 +3,7 @@
<div id="column-right"> <div id="column-right">
</div> </div>
<div id="column-left"> {include file="columnleftstart.tpl"}
<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">
<h2>{str section=admin tag=editmenus}</h2> <h2>{str section=admin tag=editmenus}</h2>
{str tag=edit}: {str tag=edit}:
...@@ -18,10 +14,6 @@ ...@@ -18,10 +14,6 @@
</select> </select>
<div id="menuitemlist"></div> <div id="menuitemlist"></div>
{include file="columnleftend.tpl"}
</div>
</span></span></span></span></div>
</div>
</div>
{include file="footer.tpl"} {include file="footer.tpl"}
...@@ -3,18 +3,10 @@ ...@@ -3,18 +3,10 @@
<div id="column-right"> <div id="column-right">
</div> </div>
<div id="column-left"> {include file="columnleftstart.tpl"}
<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">
<h2>{str section=admin tag=editsitecontent}</h2> <h2>{str section=admin tag=editsitecontent}</h2>
{$pageeditform} {$pageeditform}
{include file="columnleftend.tpl"}
</div>
</span></span></span></span></div>
</div>
</div>
{include file="footer.tpl"} {include file="footer.tpl"}
...@@ -3,11 +3,7 @@ ...@@ -3,11 +3,7 @@
<div id="column-right"> <div id="column-right">
</div> </div>
<div id="column-left"> {include file="columnleftstart.tpl"}
<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">
<h2>AdminInstitutions</h2> <h2>AdminInstitutions</h2>
{if $delete_form} {if $delete_form}
...@@ -59,10 +55,6 @@ ...@@ -59,10 +55,6 @@
{/if} {/if}
{/if} {/if}
{include file="columnleftend.tpl"}
</div>
</span></span></span></span></div>
</div>
</div>
{include file="footer.tpl"} {include file="footer.tpl"}
...@@ -3,11 +3,7 @@ ...@@ -3,11 +3,7 @@
<div id="column-right"> <div id="column-right">
</div> </div>
<div id="column-left"> {include file="columnleftstart.tpl"}
<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">
<h2>Plugin Administration</h2> <h2>Plugin Administration</h2>
{foreach from=$plugins key='plugintype' item='plugins'} {foreach from=$plugins key='plugintype' item='plugins'}
...@@ -38,9 +34,6 @@ ...@@ -38,9 +34,6 @@
{/if} {/if}
{/foreach} {/foreach}
</div> {include file="columnleftend.tpl"}
</span></span></span></span></div>
</div>
</div>
{include file='footer.tpl'} {include file='footer.tpl'}
...@@ -3,17 +3,9 @@ ...@@ -3,17 +3,9 @@
<div id="column-right"> <div id="column-right">
</div> </div>
<div id="column-left"> {include file="columnleftstart.tpl"}
<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">
<h2>Plugin Administration: {$plugintype}: {$pluginname}{if $type}: {$type}{/if}</h2> <h2>Plugin Administration: {$plugintype}: {$pluginname}{if $type}: {$type}{/if}</h2>
{$form} {$form}
{include file="columnleftend.tpl"}
</div>
</span></span></span></span></div>
</div>
</div>
{include file='footer.tpl'} {include file='footer.tpl'}
{include file="header.tpl"}
<div id="column-right">
</div>
<div id="column-left">
<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">
<h2>AdminNotifications</h2>
<p>... not until stage three :)</p>
</div>
</span></span></span></span></div>
</div>
</div>
{include file="footer.tpl"}
{include file="header.tpl"}
<div id="column-right">
</div>
<div id="column-left">
<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">
<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="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