Commit a9093bac authored by Penny Leach's avatar Penny Leach

Removed old diffs from raw to the four new themes from Paul

parent 67dad675
diff -wur ../../raw/templates/view/index.tpl ./view/index.tpl
--- ../../raw/templates/view/index.tpl 2009-05-20 17:24:52.000000000 +0200
+++ ./view/index.tpl 2009-05-21 12:31:28.000000000 +0200
@@ -2,7 +2,8 @@
{include file="sidebar.tpl"}
{include file="columnleftstart.tpl"}
-<div class="addicon">
+<div>
+<span class="addicon fr">
{$createviewform}
{$createtemplateform}
<form method="post" action="{$WWWROOT}view/choosetemplate.php">
@@ -13,16 +14,13 @@
<input type="hidden" name="institution" value="{$institution}">
{/if}
</form>
-</div>
-<div class="cl"></div>
-<div>
+</span>
{if $institution}
{$institutionselector}
{/if}
-
{if $views}
-<table id="myviewstable" class="fullwidth">
+<table id="myviewstable">
<tbody>
{foreach from=$views item=view}
<tr class="{cycle values=r0,r1}">
@@ -31,37 +29,31 @@
<a href="{$WWWROOT}view/delete.php?id={$view.id}" class="fr" id="btn-deletethisview">{str tag="deletethisview" section="view"}</a>
{/if}
<h3><a href="{$WWWROOT}view/view.php?id={$view.id}">{$view.title|escape}</a></h3>
-
- {if $view.submittedto}
- <div class="viewitem submitted-viewitem">{$view.submittedto}</div>
- {else}
<div class="viewitem">
+ {if !$view.submittedto}
<a href="{$WWWROOT}view/edit.php?id={$view.id}" id="editviewdetails">{str tag="editviewnameanddescription" section="view"}</a>
+ {/if}
{if $view.description}
- <div class="viewitemdesc">{if !$view.submittedto}{/if}
- {$view.description}</div>
+ {if !$view.submittedto}<br>{/if}
+ {$view.description}
{/if}
</div>
<div class="viewitem">
- <a href="{$WWWROOT}view/blocks.php?id={$view.id}" id="editthisview">{str tag ="editthisview" section="view"}</a>
+ {if !$view.submittedto}<a href="{$WWWROOT}view/blocks.php?id={$view.id}" id="editthisview">{str tag ="editthisview" section="view"}</a><br>{/if}
{if $view.artefacts}
- <div class="viewitemdesc">{str tag="artefacts" section="view"}:
- {foreach from=$view.artefacts item=artefact name=artefacts}<a href="{$WWWROOT}view/artefact.php?artefact={$artefact.id}&amp;view={$view.id}" id="link-artefacts">{$artefact.title|escape}</a>{if !$smarty.foreach.artefacts.last}, {/if}{/foreach}</div>
+ {str tag="artefacts" section="view"}:
+ {foreach from=$view.artefacts item=artefact name=artefacts}<a href="{$WWWROOT}view/artefact.php?artefact={$artefact.id}&amp;view={$view.id}" id="link-artefacts">{$artefact.title|escape}</a>{if !$smarty.foreach.artefacts.last}, {/if}{/foreach}
{/if}
</div>
- {/if}
-
<div class="viewitem">
<a href="{$WWWROOT}view/access.php?id={$view.id}" id="editviewaccess">{str tag="editviewaccess" section="view"}</a>
<br>
{if $view.access}
- <div class="viewitemdesc"> {$view.access}
+ {$view.access}
<br>
- </div>
{/if}
-
{if $view.accessgroups}
- <div class="viewitemdesc">{str tag="whocanseethisview" section="view"}:
+ {str tag="whocanseethisview" section="view"}:
{foreach from=$view.accessgroups item=accessgroup name=artefacts}
{* this is messy, but is like this so there aren't spaces between links and commas *}
{if $accessgroup.accesstype == 'loggedin'}
@@ -72,17 +64,18 @@
({$accessgroup.roledisplay}){/if}{elseif $accessgroup.accesstype == 'user'}
<a href="{$WWWROOT}user/view.php?id={$accessgroup.id}">{$accessgroup.id|display_name|escape}</a>{/if}{if !$smarty.foreach.artefacts.last},{/if}
{/foreach}
- {if $view.template} {str tag=thisviewmaybecopied section=view}{/if}
- </div>
+ {if $view.template}<br>{str tag=thisviewmaybecopied section=view}{/if}
{else}
- <div class="viewitemdesc">
{str tag="nobodycanseethisview2" section="view"}
- </div>
{/if}
</div>
-
+ {if $view.submittedto}
+ <div class="viewitem">
+ {$view.submittedto}
+ </div>
+ {/if}
{if $view.submitto}
- <div class="viewitem submit-viewitem">
+ <div class="viewitem">
{$view.submitto}
</div>
{/if}
@@ -92,10 +85,14 @@
</tbody>
</table>
-{$pagination}
+<div class="center">{$pagination}</div>
{else}
-<div class="message" id="noviews">{if $GROUP}{str tag="noviewstosee" section="group"}{elseif $institution}{str tag="noviews" section="view"}{else}{str tag="youhavenoviews" section="view"}{/if}</div>
+<table id="myviewstable"{if $member} class="groupviews"{/if}>
+ <tr>
+ <td>{if $GROUP}{str tag="noviewstosee" section="group"}{elseif $institution}{str tag="noviews" section="view"}{else}{str tag="youhavenoviews" section="view"}{/if}</td>
+ </tr>
+</table>
{/if}
</div>
diff -wur ../../raw/templates/view/sharedviews.tpl ./view/sharedviews.tpl
--- ../../raw/templates/view/sharedviews.tpl 2009-05-09 16:55:22.000000000 +0200
+++ ./view/sharedviews.tpl 2009-05-21 12:31:28.000000000 +0200
@@ -29,7 +29,11 @@
</table>
<div class="center">{$pagination}</div>
{else}
-<div class="message">{str tag="noviewstosee" section="group"}</div>
+<table id="myviewstable"{if $member} class="groupviews"{/if}>
+ <tr>
+ <td>{str tag="noviewstosee" section="group"}</td>
+ </tr>
+</table>
{/if}
--- ../../raw/templates/header.tpl 2009-05-09 16:55:22.000000000 +0200
+++ header.tpl 2009-05-21 14:15:20.000000000 +0200
@@ -28,7 +28,6 @@
<link rel="stylesheet" type="text/css" href="{$cssurl}">
{/foreach}
<link rel="stylesheet" type="text/css" href="{theme_path location='style/print.css'}" media="print">
- <script type="text/javascript" src="{$WWWROOT}js/css.js"></script>
<link rel="shortcut icon" href="{$WWWROOT}favicon.ico" type="image/vnd.microsoft.icon">
</head>
<body>
@@ -63,13 +62,28 @@
<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>
+ <div id="mainnav-container">
<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 $LOGGEDIN}{if $USER->get('admin') || $USER->is_institutional_admin()}{if $ADMIN || $INSTITUTIONALADMIN}<li><a href="{$WWWROOT}">{str tag="returntosite"}</a></li>{elseif $USER->get('admin')}<li><a href="{$WWWROOT}admin/">{str tag="siteadministration"}</a></li>{else}<li><a href="{$WWWROOT}admin/users/search.php">{str tag="useradministration"}</a></li>{/if}{* <li><a href="" onclick="createLoggingPane(); return false;">Create Logging Pane</a></li> *}{/if}<li><a href="{$WWWROOT}?logout">{str tag="logout"}</a></li>{/if}
+{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}">{str tag="returntosite"}</a></li>
+{elseif $USER->get('admin')}
+<li><a href="{$WWWROOT}admin/">{str tag="siteadministration"}</a></li>
+{else}
+<li><a href="{$WWWROOT}admin/users/search.php">{str tag="useradministration"}</a></li>
+{/if}
+{* <li><a href="" onclick="createLoggingPane(); return false;">Create Logging Pane</a></li> *}
+{/if}
+<li><a href="{$WWWROOT}?logout">{str tag="logout"}</a></li>
+{/if}
</ul>
</div>
- </div>
+
<div id="subnav">
{if $MAINNAVSELECTED.submenu}
<ul>
@@ -78,4 +92,5 @@
{/if}
{/if}
</div>
+
<div id="mainwrapper">
--- ../../raw/templates/header.tpl 2009-05-09 16:55:22.000000000 +0200
+++ header.tpl 2009-05-21 13:09:43.000000000 +0200
@@ -28,7 +28,6 @@
<link rel="stylesheet" type="text/css" href="{$cssurl}">
{/foreach}
<link rel="stylesheet" type="text/css" href="{theme_path location='style/print.css'}" media="print">
- <script type="text/javascript" src="{$WWWROOT}js/css.js"></script>
<link rel="shortcut icon" href="{$WWWROOT}favicon.ico" type="image/vnd.microsoft.icon">
</head>
<body>
@@ -63,13 +62,28 @@
<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>
+ <div id="mainnav-container">
<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 $LOGGEDIN}{if $USER->get('admin') || $USER->is_institutional_admin()}{if $ADMIN || $INSTITUTIONALADMIN}<li><a href="{$WWWROOT}">{str tag="returntosite"}</a></li>{elseif $USER->get('admin')}<li><a href="{$WWWROOT}admin/">{str tag="siteadministration"}</a></li>{else}<li><a href="{$WWWROOT}admin/users/search.php">{str tag="useradministration"}</a></li>{/if}{* <li><a href="" onclick="createLoggingPane(); return false;">Create Logging Pane</a></li> *}{/if}<li><a href="{$WWWROOT}?logout">{str tag="logout"}</a></li>{/if}
+{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}">{str tag="returntosite"}</a></li>
+{elseif $USER->get('admin')}
+<li><a href="{$WWWROOT}admin/">{str tag="siteadministration"}</a></li>
+{else}
+<li><a href="{$WWWROOT}admin/users/search.php">{str tag="useradministration"}</a></li>
+{/if}
+{* <li><a href="" onclick="createLoggingPane(); return false;">Create Logging Pane</a></li> *}
+{/if}
+<li><a href="{$WWWROOT}?logout">{str tag="logout"}</a></li>
+{/if}
</ul>
</div>
- </div>
+
<div id="subnav">
{if $MAINNAVSELECTED.submenu}
<ul>
@@ -78,4 +92,5 @@
{/if}
{/if}
</div>
+ </div>
<div id="mainwrapper">
--- ../../raw/templates/header.tpl 2009-05-09 16:55:22.000000000 +0200
+++ header.tpl 2009-05-21 13:11:56.000000000 +0200
@@ -28,7 +28,6 @@
<link rel="stylesheet" type="text/css" href="{$cssurl}">
{/foreach}
<link rel="stylesheet" type="text/css" href="{theme_path location='style/print.css'}" media="print">
- <script type="text/javascript" src="{$WWWROOT}js/css.js"></script>
<link rel="shortcut icon" href="{$WWWROOT}favicon.ico" type="image/vnd.microsoft.icon">
</head>
<body>
@@ -63,13 +62,28 @@
<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>
+ <div id="mainnav-container">
<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 $LOGGEDIN}{if $USER->get('admin') || $USER->is_institutional_admin()}{if $ADMIN || $INSTITUTIONALADMIN}<li><a href="{$WWWROOT}">{str tag="returntosite"}</a></li>{elseif $USER->get('admin')}<li><a href="{$WWWROOT}admin/">{str tag="siteadministration"}</a></li>{else}<li><a href="{$WWWROOT}admin/users/search.php">{str tag="useradministration"}</a></li>{/if}{* <li><a href="" onclick="createLoggingPane(); return false;">Create Logging Pane</a></li> *}{/if}<li><a href="{$WWWROOT}?logout">{str tag="logout"}</a></li>{/if}
+{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}">{str tag="returntosite"}</a></li>
+{elseif $USER->get('admin')}
+<li><a href="{$WWWROOT}admin/">{str tag="siteadministration"}</a></li>
+{else}
+<li><a href="{$WWWROOT}admin/users/search.php">{str tag="useradministration"}</a></li>
+{/if}
+{* <li><a href="" onclick="createLoggingPane(); return false;">Create Logging Pane</a></li> *}
+{/if}
+<li><a href="{$WWWROOT}?logout">{str tag="logout"}</a></li>
+{/if}
</ul>
</div>
- </div>
+
<div id="subnav">
{if $MAINNAVSELECTED.submenu}
<ul>
@@ -78,4 +92,5 @@
{/if}
{/if}
</div>
+ </div>
<div id="mainwrapper">
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