Commit 49e8470c authored by Nigel McNie's avatar Nigel McNie
Browse files

The great themebusting commit of '09!

Strips down the default theme to a very bare minimum, to allow better theming.

The next commits will move this theme to 'raw', and commit a new default theme that looks mostly like the old one.
parent 47429887
......@@ -43,7 +43,7 @@ $authobj = AuthFactory::create($USER->authinstance);
if (method_exists($authobj, 'change_password')) {
$elements = array(
'changepassworddesc' => array(
'value' => '<tr><td colspan="2"><p>' . get_string('changepassworddesc', 'account') . '</p></td></tr>'
'value' => '<tr><td colspan="2"><h3>' . get_string('changepassworddesc', 'account') . '</h3></td></tr>'
),
'oldpassword' => array( 'type' => 'password',
'title' => get_string('oldpassword'),
......@@ -64,7 +64,7 @@ else if ($url = get_config_plugin_instance('auth', $USER->authinstance, 'changep
// @todo contextual help
$elements = array(
'changepasswordotherinterface' => array(
'value' => '<tr><td colspan="2"><p>' . get_string('changepasswordotherinterface', 'account', $url) . '</p></td></tr>'
'value' => '<tr><td colspan="2"><h3>' . get_string('changepasswordotherinterface', 'account', $url) . '</h3></td></tr>'
)
);
}
......@@ -74,7 +74,7 @@ else {
if ($authobj->authname == 'internal') {
$elements['changeusernameheading'] = array(
'value' => '<tr><td colspan="2"><p>' . get_string('changeusernameheading', 'account') . '</p></td></tr>'
'value' => '<tr><td colspan="2"><h3>' . get_string('changeusernameheading', 'account') . '</h3></td></tr>'
);
$elements['username'] = array(
'type' => 'text',
......@@ -85,7 +85,7 @@ if ($authobj->authname == 'internal') {
}
$elements['accountoptionsdesc'] = array(
'value' => '<tr><td colspan="2"><p>' . get_string('accountoptionsdesc', 'account') . '</p></td></tr>'
'value' => '<tr><td colspan="2"><h3>' . get_string('accountoptionsdesc', 'account') . '</h3></td></tr>'
);
$elements['friendscontrol'] = array(
'type' => 'radio',
......@@ -103,6 +103,7 @@ $elements['wysiwyg'] = array(
'type' => 'radio',
'defaultvalue' => $prefs->wysiwyg,
'title' => get_string('wysiwygdescr', 'account'),
'separator' => '<br>',
'options' => array(
1 => get_string('on', 'account'),
0 => get_string('off', 'account'),
......@@ -138,6 +139,7 @@ $elements['addremovecolumns'] = array(
),
'defaultvalue' => $prefs->addremovecolumns,
'title' => get_string('showviewcolumns', 'account'),
'separator' => '<br>',
'help' => 'true'
);
$elements['submit'] = array(
......
......@@ -9,6 +9,44 @@
{include file="sidebar.tpl"}
{include file="columnleftstart.tpl"}
<<<<<<< Updated upstream:htdocs/artefact/blog/theme/default/editpost.tpl
{$form}
=======
{$textinputform}
<div id='uploader'></div>
<div id='browsebuttonstuff'>
<input id='browsebutton' type='button' class='button' value='{str tag=browsemyfiles section=artefact.blog}'>
</div>
<div id='browsemyfiles' style='display: none;'>
<h3>{str tag=myfiles section='artefact.file'}</h3>
<table id='filebrowser' class='tablerenderer fullwidth'>
<thead><tr>
<th></th>
<th>{str section=artefact.file tag=Name}</th>
<th>{str section=artefact.file tag=Description}</th>
<th>{str section=artefact.file tag=Size}</th>
<th>{str section=artefact.file tag=Date}</th>
<th></th>
</tr></thead>
<tbody><tr><td></td></tr></tbody>
</table>
</div>
<h3>{str section=artefact.blog tag=attachedfiles}</h3>
<table id='attachedfiles' class='tablerenderer fullwidth'>
<thead><tr>
<th></th>
<th>{str section=artefact.file tag=Name}</th>
<th>{str section=artefact.file tag=Description}</th>
<th>{str tag=tags}</th>
<th></th>
</tr></thead>
<tbody><tr><td></td></tr></tbody>
</table>
{$draftform}
<div id='savecancel'>
<input type='button' class='button' value='{str tag=savepost section=artefact.blog}' onclick="saveblogpost()">
<input type='button' class='cancel' value='{str tag=cancel}' onclick="canceledit()">
</div>
>>>>>>> Stashed changes:htdocs/artefact/blog/theme/default/editpost.tpl
{include file="columnleftend.tpl"}
{include file="footer.tpl"}
......@@ -11,10 +11,10 @@
{include file="columnleftstart.tpl"}
<div id="myblogs">
<span class="addicon fr">
<span class="addicon">
<a href="{$WWWROOT}artefact/blog/new/">{str section="artefact.blog" tag="addblog"}</a>
</span>
<table id="bloglist" class="hidden tablerenderer">
<table id="bloglist" class="hidden tablerenderer fullwidth">
<thead>
<tr>
<th>{str section="artefact.blog" tag="title"}</th>
......
......@@ -11,17 +11,17 @@
{include file="columnleftstart.tpl"}
<div id="myblogs">
{$blog->get('description')}
<span class="addicon fr">
<a href="{$WWWROOT}artefact/blog/post.php?blog={$blog->get('id')}">{str section="artefact.blog" tag="addpost"}</a>
<a href="{$WWWROOT}artefact/blog/settings/?id={$blog->get('id')}">{str section="artefact.blog" tag="settings"}</a>
</span>
<span class="addicon fr">
<a href="{$WWWROOT}artefact/blog/post.php?blog={$blog->get('id')}">{str section="artefact.blog" tag="addpost"}</a>
<a href="{$WWWROOT}artefact/blog/settings/?id={$blog->get('id')}">{str section="artefact.blog" tag="settings"}</a>
</span>
<p>{$blog->get('description')}</p>
{if $blog->count_children() > 0}
<div><table id="postlist" class="hidden tablerenderer">
<div><table id="postlist" class="hidden tablerenderer fullwidth">
<tbody>
<tr><td></td><td></td><td></td></tr>
<tr><td></td><td></td><td></td></tr>
</tbody>
</table></div>
{else}
......
......@@ -101,7 +101,7 @@ var table = new TableRenderer(
'profileicons.json.php',
[
function(rowdata) {
return TD(null, IMG({'src': '$wwwroot/thumb.php?type=profileiconbyid&maxsize=100&id=' + rowdata.id, 'alt': rowdata.note}));
return TD({'class': 'center', 'width': '120px'}, null, IMG({'src': '$wwwroot/thumb.php?type=profileiconbyid&maxsize=100&id=' + rowdata.id, 'alt': rowdata.note}));
},
function(rowdata) {
return TD(null, rowdata.title ? rowdata.title : rowdata.note);
......@@ -115,10 +115,10 @@ var table = new TableRenderer(
if (rowdata['isdefault'] == 't' || rowdata['isdefault'] == 1) {
options.checked = 'checked';
}
return TD({'class': 'center'}, INPUT(options));
return TD({'class': 'left', 'width': '110px'}, INPUT(options));
},
function(rowdata) {
return TD({'class': 'center'}, INPUT({'type': 'checkbox', 'name': 'icons[' + rowdata.id + ']'}));
return TD({'class': 'left', 'width': '110px'}, INPUT({'type': 'checkbox', 'name': 'icons[' + rowdata.id + ']'}));
}
]
);
......
......@@ -21,7 +21,9 @@
<td><img src="{$child->iconsrc}" border="0" alt="{$child->artefacttype|escape}"></td>
<td><a href="{$WWWROOT}view/artefact.php?artefact={$child->id|escape}&amp;view={$viewid|escape}" title="{$child->hovertitle}">{$child->title}</a></td>
<td>{$child->description|escape}</td>
{if !$simpledisplay}<td>{$child->date}</td>{/if}
{if !$simpledisplay}
<td>{$child->date}</td>
{/if}
</tr>
{/foreach}
</tbody></table>
......
......@@ -8,7 +8,7 @@
{str tag='fileinstructions' section='artefact.file'}
<div id="myfiles">
<div id="uploader"></div>
<table id="filelist" class="hidden tablerenderer">
<table id="filelist" class="hidden tablerenderer fullwidth">
<thead><tr>
<th></th>
<th>{str tag=Name section=artefact.file}</th>
......
......@@ -13,10 +13,7 @@
<tbody>
</tbody>
<tfoot>
<td></td>
<td></td>
<td><input id="settings_default" type="submit" class="submit" name="default" value="{str tag="setdefault" section=artefact.file}" tabindex="2"> {str tag="or" section="artefact.file"} <input type="submit" class="submit" name="unsetdefault" value="{str tag="usenodefault" section="artefact.file}" tabindex="2"></td>
<td><input id="settings_delete" type="submit" class="submit" name="delete" value="{str tag="deleteselectedicons" section=artefact.file}" tabindex="2"></td>
<td colspan="4" class="right"><input id="settings_default" type="submit" class="submit" name="default" value="{str tag="setdefault" section=artefact.file}" tabindex="2"> {str tag="or" section="artefact.file"} <input type="submit" class="submit" name="unsetdefault" value="{str tag="usenodefault" section="artefact.file}" tabindex="2"> <input id="settings_delete" type="submit" class="cancel" name="delete" value="{str tag="deleteselectedicons" section=artefact.file}" tabindex="2"></td>
</tfoot>
</table>
<input type="hidden" name="pieform_settings" value="">
......
{if !$hidetitle}<h3>{str tag='book' section='artefact.resume'}
<fieldset>{if !$hidetitle}<legend class="resumeh3">{str tag='book' section='artefact.resume'}
{if $controls}
{contextualhelp plugintype='artefact' pluginname='resume' section='addbook'}
{/if}
</h3>{/if}
</legend>{/if}
<table id="booklist{$suffix}" class="tablerenderer resumefour resumecomposite">
<colgroup width="25%" span="1"></colgroup>
<thead>
......@@ -27,7 +27,8 @@
</table>
{if $controls}
<div>
<button id="addbookbutton" onclick="toggleCompositeForm('book');">{str tag='add'}</button>
<div id="bookform" class="hidden">{$compositeforms.book}</div>
<button id="addbookbutton" class="cancel" onclick="toggleCompositeForm('book');">{str tag='add'}</button>
</div>
{/if}
</fieldset>
{if !$hidetitle}<h3>{str tag='certification' section='artefact.resume'}
<fieldset>{if !$hidetitle}<legend class="resumeh3">{str tag='certification' section='artefact.resume'}
{if $controls}
{contextualhelp plugintype='artefact' pluginname='resume' section='addcertification'}
{/if}
</h3>{/if}
</legend>{/if}
<table id="certificationlist{$suffix}" class="tablerenderer resumefour resumecomposite">
<colgroup width="25%" span="1"></colgroup>
<thead>
......@@ -27,7 +27,8 @@
</table>
{if $controls}
<div>
<button id="addcertificationbutton" onclick="toggleCompositeForm('certification');">{str tag='add'}</button>
<div id="certificationform" class="hidden">{$compositeforms.certification}</div>
<button id="addcertificationbutton" class="cancel" onclick="toggleCompositeForm('certification');">{str tag='add'}</button>
</div>
{/if}
</fieldset>
<table>
<table class="resumecontactinfo">
<tr>
<th>{str tag='address' section='artefact.internal'}</th>
<td>{$address}</td>
......
{if $hascontent}
<table>
<table class="resumecontactinfo">
<colgroup width="50%" span="2"></colgroup>
{if $address}
<tr>
......
{if !$hidetitle}<h3>{str tag='educationhistory' section='artefact.resume'}
<fieldset>{if !$hidetitle}<legend class="resumeh3">{str tag='educationhistory' section='artefact.resume'}
{if $controls}
{contextualhelp plugintype='artefact' pluginname='resume' section='addeducationhistory'}
{/if}
</h3>{/if}
</legend>{/if}
<table id="educationhistorylist{$suffix}" class="tablerenderer resumefive resumecomposite">
<colgroup width="25%" span="2"></colgroup>
<thead>
......@@ -29,7 +29,8 @@
</table>
{if $controls}
<div>
<button id="addeducationhistorybutton" onclick="toggleCompositeForm('educationhistory');">{str tag='add'}</button>
<div id="educationhistoryform" class="hidden">{$compositeforms.educationhistory}</div>
<button id="addeducationhistorybutton" class="cancel" onclick="toggleCompositeForm('educationhistory');">{str tag='add'}</button>
</div>
{/if}
</fieldset>
{if !$hidetitle}<h3>{str tag='employmenthistory' section='artefact.resume'}
<fieldset>{if !$hidetitle}<legend class="resumeh3">{str tag='employmenthistory' section='artefact.resume'}
{if $controls}
{contextualhelp plugintype='artefact' pluginname='resume' section='addemploymenthistory'}
{/if}
</h3>{/if}
</legend>{/if}
<table id="employmenthistorylist{$suffix}" class="tablerenderer resumefive resumecomposite">
<colgroup width="25%" span="2"></colgroup>
<thead>
......@@ -30,7 +30,8 @@
</table>
{if $controls}
<div>
<button id="addemploymenthistorybutton" onclick="toggleCompositeForm('employmenthistory');">{str tag='add'}</button>
<div id="employmenthistoryform" class="hidden">{$compositeforms.employmenthistory}</div>
<button id="addemploymenthistorybutton" class="cancel" onclick="toggleCompositeForm('employmenthistory');">{str tag='add'}</button>
</div>
{/if}
</fieldset>
<h3>{$type}</h3>
<h3 class="resumeh3">{$type}</h3>
<p>{$content}</p>
{if !$hidetitle}<h3>{str tag='membership' section='artefact.resume'}
<fieldset>{if !$hidetitle}<legend class="resumeh3">{str tag='membership' section='artefact.resume'}
{if $controls}
{contextualhelp plugintype='artefact' pluginname='resume' section='addmembership'}
{/if}
</h3>{/if}
</legend>{/if}
<table id="membershiplist{$suffix}" class="tablerenderer resumefive resumecomposite">
<colgroup width="25%" span="2"></colgroup>
<thead>
......@@ -29,7 +29,8 @@
</table>
{if $controls}
<div>
<button id="addmembershipbutton" onclick="toggleCompositeForm('membership');">{str tag='add'}</button>
<div id="membershipform" class="hidden">{$compositeforms.membership}</div>
<button id="addmembershipbutton" class="cancel" onclick="toggleCompositeForm('membership');">{str tag='add'}</button>
</div>
{/if}
</fieldset>
<table>
<table class="resumepersonalinfo">
<colgroup width="50%" span="2"></colgroup>
{foreach from=$fields key='field' item='value'}
<tr>
......
......@@ -4,6 +4,7 @@
{include file="sidebar.tpl"}
</div>
{include file="columnleftstart.tpl"}
<div id="resumewrap">
{$coverletterform}
{$interestsform}
{$contactinformationform}
......@@ -13,5 +14,6 @@
{include file="artefact:resume:fragments/certification.tpl" controls="true"}
{include file="artefact:resume:fragments/book.tpl" controls="true"}
{include file="artefact:resume:fragments/membership.tpl" controls="true"}
</div>
{include file="columnleftend.tpl"}
{include file="footer.tpl"}
......@@ -5,10 +5,9 @@
{if $wallposts}
{foreach from=$wallposts item=wallpost}
<div class="wallpost{if $wallpost->private} private{/if}">
<div class="userinfo"><img src="{$WWWROOT}thumb.php?type=profileicon&maxwidth=25&maxheight=25&id={$wallpost->from}" alt="Profile Icon" class="fl">
<div><a href="{$WWWROOT}user/view.php?id={$wallpost->userid|escape}">{$wallpost->displayname|escape}</a>
<span class="postedon"> - {$wallpost->postdate|format_date}</span>
</div></div>
<div class="userinfo"><img src="{$WWWROOT}thumb.php?type=profileicon&maxwidth=25&maxheight=25&id={$wallpost->from}" alt="Profile Icon">
<div class="userinforight"><strong><a href="{$WWWROOT}user/view.php?id={$wallpost->userid|escape}">{$wallpost->displayname|escape}</a></strong><span class="postedon"> - {$wallpost->postdate|format_date}</span></div>
</div>
<div class="text">{$wallpost->text|parse_bbcode}</div>
{*<div class="controls">
{if $ownwall}
......@@ -23,7 +22,7 @@
</div>
{/foreach}
{if !$wholewall}
<a href="{$WWWROOT}blocktype/wall/wall.php?id={$instanceid}">{str tag='wholewall' section='blocktype.wall'}</a>
<div class="right"><strong><a href="{$WWWROOT}blocktype/wall/wall.php?id={$instanceid}">{str tag='wholewall' section='blocktype.wall'} &raquo;</a></strong></div>
{/if}
{/if}
</div>
......@@ -4,9 +4,9 @@
// element, but there's no validation or descriptions on this form currently
echo $form_tag;
echo '<div>' . $elements['text']['html'] .'</div>';
echo '<div class="description">' . $elements['text']['description'] . '</div>';
echo '<div>' . $elements['private']['labelhtml'] . ' ' . $elements['private']['html'] . '</div>';
echo '<div>' . $elements['text']['html'] .'</div>';
echo '<div class="makeprivate">' . $elements['private']['labelhtml'] . ' ' . $elements['private']['html'] . '</div>';
echo '<div>' . $elements['submit']['html'] . '</div>';
echo $hidden_elements;
echo '</form>';
......
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