Commit 76312947 authored by Jyhem's avatar Jyhem

[REF] Clean templates formatting so they are legible and maintainable again

parent 00a1f7f4
......@@ -7,7 +7,9 @@
{if $blog_data.use_description eq 'y' && $description neq ""}
<div class="description help-block">{$description|escape}</div>
{/if}
{* example code to add more info to the default blog heading if desired
{* Below is example code if you wish to add more info to the default blog heading
* remove the line above (starting curly bracket then asterisk) and the last line to enable
<div class="bloginfo">
{tr}Created by{/tr} {$creator|userlink} {$created|tiki_short_datetime:on}<br>
......
......@@ -4,7 +4,8 @@
{if $blog_data.use_breadcrumbs eq 'y'}
<div class="breadcrumb"><a class="link" href="tiki-list_blogs.php">{tr}Blogs{/tr}</a> {$prefs.site_crumb_seper} <a class="link" href="tiki-view_blog.php?blogId={$post_info.blogId}">{$blog_data.title|escape}</a> {$prefs.site_crumb_seper} {$post_info.title|escape}</div>
{/if}
{* example code to add more info to the default blog heading if desired
{* below is example code. In case you desire to add more info to the default blog heading
* remove the line above (starting curly bracket then asterisk) and the last line to enable
<div class="bloginfo">
{tr}Created by{/tr} {$post_info.user|userlink} {$post_info.created|tiki_short_datetime:on}<br>
......
This diff is collapsed.
<h2>{tr}backlinks to{/tr} <a href="tiki-index.php?page={$page|escape:url}" class="wiki">{$page|escape}</a>:</h2>
<ul>
{section name=back loop=$backlinks}
<li><a href="tiki-index.php?page={$backlinks[back].fromPage|escape:"url"}" class="wiki">{$backlinks[back].fromPage|escape}</a><br></li>
<li><a href="tiki-index.php?page={$backlinks[back].fromPage|escape:"url"}" class="wiki">{$backlinks[back].fromPage|escape}</a><br></li>
{sectionelse}
{tr}No backlinks to this page{/tr}
{/section}
......
......@@ -35,28 +35,26 @@
</tr>
{/foreach}
</table>
<br>
&nbsp;&nbsp;&nbsp;&nbsp; <input type="checkbox" name="removeExt" value="true" id="removeExt"> {tr}Remove File Extension from Image Name{/tr}<br>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; {tr}eg. from "digicam0001.jpg" then name digicam0001 will be used for the name field{/tr}<br>
<br>
{if $permAddGallery eq "y"}
&nbsp;&nbsp;&nbsp;&nbsp; <input type="checkbox" name="subdirToSubgal" value="true" id="subdirToSubgal"> {tr}Convert the last sub directory to a sub gallery{/tr}<br>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; {tr}eg. from "misc/screenshots/digicam0001.jpg" a gallery named "screenshots" will be created{/tr}<br>
<br>
{/if}
&nbsp;&nbsp;&nbsp;&nbsp; <input type="checkbox" name="subToDesc" value="true" id="subToDesc"> {tr}Use the last sub directory name as description{/tr}<br>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; {tr}eg. from "misc/screenshots/digicam0001.jpg" a description "screenshots" will be created{/tr}<br>
<br>
&nbsp;&nbsp;&nbsp;&nbsp; {tr}Select a Gallery{/tr}
<select name="galleryId">
{section name=idx loop=$galleries}
{if ($galleries[idx].individual eq 'n') or ($galleries[idx].individual_tiki_p_batch_upload_image_dir eq 'y')}
<option value="{$galleries[idx].galleryId}" {if $galleries[idx].galleryId eq $galleryId}selected="selected"{/if}>{$galleries[idx].name}</option>
{/if}
{/section}
</select>
&nbsp;&nbsp;&nbsp;&nbsp; <input type="submit" class="btn btn-default btn-sm" name="batch_upload" value="{tr}Process{/tr}">
<br>
&nbsp;&nbsp;&nbsp;&nbsp; <input type="checkbox" name="removeExt" value="true" id="removeExt"> {tr}Remove File Extension from Image Name{/tr}<br>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; {tr}eg. from "digicam0001.jpg" then name digicam0001 will be used for the name field{/tr}<br>
<br>
{if $permAddGallery eq "y"}
&nbsp;&nbsp;&nbsp;&nbsp; <input type="checkbox" name="subdirToSubgal" value="true" id="subdirToSubgal"> {tr}Convert the last sub directory to a sub gallery{/tr}<br>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; {tr}eg. from "misc/screenshots/digicam0001.jpg" a gallery named "screenshots" will be created{/tr}<br>
<br>
{/if}
&nbsp;&nbsp;&nbsp;&nbsp; <input type="checkbox" name="subToDesc" value="true" id="subToDesc"> {tr}Use the last sub directory name as description{/tr}<br>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; {tr}eg. from "misc/screenshots/digicam0001.jpg" a description "screenshots" will be created{/tr}<br>
<br>
&nbsp;&nbsp;&nbsp;&nbsp; {tr}Select a Gallery{/tr}
<select name="galleryId">
{section name=idx loop=$galleries}
{if ($galleries[idx].individual eq 'n') or ($galleries[idx].individual_tiki_p_batch_upload_image_dir eq 'y')}
<option value="{$galleries[idx].galleryId}" {if $galleries[idx].galleryId eq $galleryId}selected="selected"{/if}>{$galleries[idx].name}</option>
{/if}
{/section}
</select>
&nbsp;&nbsp;&nbsp;&nbsp; <input type="submit" class="btn btn-default btn-sm" name="batch_upload" value="{tr}Process{/tr}">
</form>
<br>
......@@ -44,112 +44,112 @@
<input type="hidden" name="postId" value="{$postId|escape}">
<fieldset class="tabcontent">
{if $blogs|@count gt 1 and ( !isset($blogId) or $blogId eq 0 )}
{if $blogs|@count gt 1 and ( !isset($blogId) or $blogId eq 0 )}
<div class="form-group">
<label class="col-sm-2 control-label" for="blogId">{tr}Blog{/tr}</label>
<div class="col-sm-10">
<select name="blogId" id="blogId" class="form-control">
{section name=ix loop=$blogs}
<option value="{$blogs[ix].blogId|escape}" {if $blogs[ix].blogId eq $blogId}selected="selected"{/if}>{$blogs[ix].title|escape}</option>
{/section}
</select>
</div>
</div>
{else}
<input type="hidden" name="blogId" value="{$blogId|escape}">
{/if}
<div class="form-group">
<label class="col-sm-2 control-label" for="blogId">{tr}Blog{/tr}</label>
<label class="col-sm-2 control-label" for="title">{tr}Title{/tr}</label>
<div class="col-sm-10">
<select name="blogId" id="blogId" class="form-control">
{section name=ix loop=$blogs}
<option value="{$blogs[ix].blogId|escape}" {if $blogs[ix].blogId eq $blogId}selected="selected"{/if}>{$blogs[ix].title|escape}</option>
{/section}
</select>
<input type="text" maxlength="255" class="form-control" name="title" id="blog_title" {if isset($post_info.title)}value="{$post_info.title|escape}"{/if}>
</div>
</div>
{else}
<input type="hidden" name="blogId" value="{$blogId|escape}">
{/if}
<div class="form-group">
<label class="col-sm-2 control-label" for="title">{tr}Title{/tr}</label>
<div class="col-sm-10">
<input type="text" maxlength="255" class="form-control" name="title" id="blog_title" {if isset($post_info.title)}value="{$post_info.title|escape}"{/if}>
</div>
</div>
<div class="form-group">
<label class="col-sm-12" for="blogedit">{tr}Body{/tr}</label>
<div class="col-sm-12">
{textarea id='blogedit' class="form-control wikiedit" name="data"}{if isset($data)}{$data}{/if}{/textarea}
<div class="form-group">
<label class="col-sm-12" for="blogedit">{tr}Body{/tr}</label>
<div class="col-sm-12">
{textarea id='blogedit' class="form-control wikiedit" name="data"}{if isset($data)}{$data}{/if}{/textarea}
</div>
</div>
</div>
{if $blog_data.use_excerpt eq 'y'}
<div class="form-group">
<label class="col-sm-2 control-label" for="post_excerpt">{tr}Excerpt{/tr}</label>
<div class="col-sm-10">
{textarea id='post_excerpt' class="form-control wikiedit" name="excerpt"}{if isset($post_info.excerpt)}{$post_info.excerpt}{/if}{/textarea}
</div>
</div>
{/if}
{if $postId > 0 && $wysiwyg ne 'y'}
{if count($post_images) > 0}
<div class="form-group">
<label class="col-sm-2 control-label" for="post_images">{tr}Images{/tr}</label>
<div class="col-sm-10">
<table>
{section name=ix loop=$post_images}
<tr>
<td>
<a class="link" href="tiki-view_blog_post_image.php?imgId={$post_images[ix].imgId}">{$post_images[ix].filename}</a>
</td>
<td>
<textarea rows="2" cols="40">{$post_images[ix].link|escape}</textarea><br>
<textarea rows="1" cols="40">{$post_images[ix].absolute|escape}</textarea>
</td>
<td>
<a href="tiki-blog_post.php?postId={$postId}&amp;remove_image={$post_images[ix].imgId}"><img src='img/icons/trash.gif' alt="{tr}Trash{/tr}"></a>
</td>
</tr>
{/section}
</table>
{if $blog_data.use_excerpt eq 'y'}
<div class="form-group">
<label class="col-sm-2 control-label" for="post_excerpt">{tr}Excerpt{/tr}</label>
<div class="col-sm-10">
{textarea id='post_excerpt' class="form-control wikiedit" name="excerpt"}{if isset($post_info.excerpt)}{$post_info.excerpt}{/if}{/textarea}
</div>
</div>
{/if}
{/if}
{if $prefs.geo_locate_blogpost eq 'y'}
<div class="form-group">
<label class="col-sm-2 control-label" for="geolocation">{tr}Location{/tr}</label>
<div class="col-sm-10">
{$headerlib->add_map()}
<div class="map-container form-control" data-geo-center="{defaultmapcenter}" data-target-field="geolocation" style="height: 250px;"></div>
<input type="hidden" name="geolocation" id="geolocation" value="{$geolocation_string}">
</div>
</div>
{/if}
<div class="form-group">
<label class="col-sm-2 control-label" for="blogpriv">{tr}Mark entry as private{/tr}</label>
<div class="col-sm-10 checkbox-inline">
<input type="checkbox" name="blogpriv" id="blogpriv" {if $blogpriv eq 'y'}checked="checked"{/if}>
</div>
</div>
{if $postId > 0 && $wysiwyg ne 'y'}
{if count($post_images) > 0}
<div class="form-group">
<label class="col-sm-2 control-label" for="post_images">{tr}Images{/tr}</label>
<div class="col-sm-10">
<table>
{section name=ix loop=$post_images}
<tr>
<td>
<a class="link" href="tiki-view_blog_post_image.php?imgId={$post_images[ix].imgId}">{$post_images[ix].filename}</a>
</td>
<td>
<textarea rows="2" cols="40">{$post_images[ix].link|escape}</textarea><br>
<textarea rows="1" cols="40">{$post_images[ix].absolute|escape}</textarea>
</td>
<td>
<a href="tiki-blog_post.php?postId={$postId}&amp;remove_image={$post_images[ix].imgId}"><img src='img/icons/trash.gif' alt="{tr}Trash{/tr}"></a>
</td>
</tr>
{/section}
</table>
</div>
</div>
{/if}
{/if}
{if $prefs.feature_blog_edit_publish_date eq 'y'}
<div class="form-group">
<label class="col-sm-2 control-label" for="show_pubdate">{tr}Publish Date{/tr}</label>
<div class="col-sm-10">
{if isset($post_info.created)}
{$created = $post_info.created}
{else}
{$created = ''}
{/if}
{html_select_date prefix="publish_" time=$created start_year="-5" end_year="+10" field_order=$prefs.display_field_order} {tr}at{/tr}
{html_select_time prefix="publish_" time=$created display_seconds=false use_24_hours=$use_24hr_clock}
</div>
{if $prefs.geo_locate_blogpost eq 'y'}
<div class="form-group">
<label class="col-sm-2 control-label" for="geolocation">{tr}Location{/tr}</label>
<div class="col-sm-10">
{$headerlib->add_map()}
<div class="map-container form-control" data-geo-center="{defaultmapcenter}" data-target-field="geolocation" style="height: 250px;"></div>
<input type="hidden" name="geolocation" id="geolocation" value="{$geolocation_string}">
</div>
</div>
{/if}
<div class="form-group">
<label class="col-sm-2 control-label" for="blogpriv">{tr}Mark entry as private{/tr}</label>
<div class="col-sm-10 checkbox-inline">
<input type="checkbox" name="blogpriv" id="blogpriv" {if $blogpriv eq 'y'}checked="checked"{/if}>
</div>
</div>
{/if}
{if $prefs.feature_freetags eq 'y' and $tiki_p_freetags_tag eq 'y'}
{include file='freetag.tpl'}
{/if}
{if $prefs.feature_contribution eq 'y'}
{include file='contribution.tpl'}
{/if}
{include file='categorize.tpl'}
</fieldset>
<div class="text-center">
<input type="submit" class="wikiaction btn btn-default" name="preview" value="{tr}Preview{/tr}" onclick="needToConfirm=false">
<input type="submit" class="wikiaction btn btn-primary" name="save" value="{tr}Save{/tr}" onclick="needToConfirm=false">
<input type="hidden" name="referer" value="{$referer|escape}">
<input type="submit" class="btn btn-link btn-sm" name="cancel" onclick='document.location="{$referer|escape:'html'}";needToConfirm=false;return false;' value="{tr}Cancel{/tr}">
</div>
{if $prefs.feature_blog_edit_publish_date eq 'y'}
<div class="form-group">
<label class="col-sm-2 control-label" for="show_pubdate">{tr}Publish Date{/tr}</label>
<div class="col-sm-10">
{if isset($post_info.created)}
{$created = $post_info.created}
{else}
{$created = ''}
{/if}
{html_select_date prefix="publish_" time=$created start_year="-5" end_year="+10" field_order=$prefs.display_field_order} {tr}at{/tr}
{html_select_time prefix="publish_" time=$created display_seconds=false use_24_hours=$use_24hr_clock}
</div>
</div>
{/if}
{if $prefs.feature_freetags eq 'y' and $tiki_p_freetags_tag eq 'y'}
{include file='freetag.tpl'}
{/if}
{if $prefs.feature_contribution eq 'y'}
{include file='contribution.tpl'}
{/if}
{include file='categorize.tpl'}
</fieldset>
<div class="text-center">
<input type="submit" class="wikiaction btn btn-default" name="preview" value="{tr}Preview{/tr}" onclick="needToConfirm=false">
<input type="submit" class="wikiaction btn btn-primary" name="save" value="{tr}Save{/tr}" onclick="needToConfirm=false">
<input type="hidden" name="referer" value="{$referer|escape}">
<input type="submit" class="btn btn-link btn-sm" name="cancel" onclick='document.location="{$referer|escape:'html'}";needToConfirm=false;return false;' value="{tr}Cancel{/tr}">
</div>
</form>
This diff is collapsed.
......@@ -36,27 +36,27 @@
$('#tagBox').tiki('autocomplete', 'tag', {multiple: true, multipleSeparator: " "} );
{/jq}
<form action="tiki-browse_freetags.php" method="get" class="freetagsearch col-md-12 form-inline form-horizontal" role="form">
<div class="row">
<label class="control-label col-sm-2" for="tabBox">{tr}Tags{/tr}</label>
<div class="input-group col-sm-7">
<input type="text" id="tagBox" class="form-control" name="tag" value="{$tagString|escape}">
</div>
<div class="col-sm-3">
{button _onclick="clearTags(); return false;" _text="{tr}Clear{/tr}"}
<input type="submit" class="btn btn-default" value="{tr}Go{/tr}">
</div>
</div>
<div class="row table spacer-bottom-15px">
<div class="col-sm-10 col-sm-offset-2 radio">
<input type="hidden" name="sort_mode" value="{$sort_mode|escape}">
<input type="radio" name="broaden" class="radio" id="stopb1" value="n"{if $broaden eq 'n'} checked="checked"{/if}>
<label for="stopb1">{tr}With all selected tags{/tr}</label>
<input type="radio" name="broaden" class="radio" id="stopb2" value="y"{if $broaden eq 'y'} checked="checked"{/if}>
<label for="stopb2">{tr}With one selected tag{/tr}</label>
<input type="radio" name="broaden" class="radio" id="stopb3" value="last"{if $broaden eq 'last'} checked="checked"{/if}>
<label for="stopb3">{tr}With last selected tag{/tr}</label>
</div>
</div>
<div class="row">
<label class="control-label col-sm-2" for="tabBox">{tr}Tags{/tr}</label>
<div class="input-group col-sm-7">
<input type="text" id="tagBox" class="form-control" name="tag" value="{$tagString|escape}">
</div>
<div class="col-sm-3">
{button _onclick="clearTags(); return false;" _text="{tr}Clear{/tr}"}
<input type="submit" class="btn btn-default" value="{tr}Go{/tr}">
</div>
</div>
<div class="row table spacer-bottom-15px">
<div class="col-sm-10 col-sm-offset-2 radio">
<input type="hidden" name="sort_mode" value="{$sort_mode|escape}">
<input type="radio" name="broaden" class="radio" id="stopb1" value="n"{if $broaden eq 'n'} checked="checked"{/if}>
<label for="stopb1">{tr}With all selected tags{/tr}</label>
<input type="radio" name="broaden" class="radio" id="stopb2" value="y"{if $broaden eq 'y'} checked="checked"{/if}>
<label for="stopb2">{tr}With one selected tag{/tr}</label>
<input type="radio" name="broaden" class="radio" id="stopb3" value="last"{if $broaden eq 'last'} checked="checked"{/if}>
<label for="stopb3">{tr}With last selected tag{/tr}</label>
</div>
</div>
{if $prefs.freetags_browse_show_cloud eq 'y'}
{jq notonready=true}
......@@ -163,12 +163,12 @@
{/foreach}
{if !empty($blogs)}
<div id="blogs"{if $type ne 'blog post'} style="visibility:hidden"{/if}>
<select name="objectId" onchange="this.form.submit();">
<option value="">--{tr}All blogs{/tr}--</option>
{foreach item=blog from=$blogs}
<option value="{$blog.blogId|escape}"{if $blog.blogId eq $objectId} selected="selected"{/if}>{$blog.title|escape}</option>
{/foreach}
</select>
<select name="objectId" onchange="this.form.submit();">
<option value="">--{tr}All blogs{/tr}--</option>
{foreach item=blog from=$blogs}
<option value="{$blog.blogId|escape}"{if $blog.blogId eq $objectId} selected="selected"{/if}>{$blog.title|escape}</option>
{/foreach}
</select>
</div>
{/if}
......@@ -178,8 +178,9 @@
<input type="submit" class="btn btn-default btn-sm" value="{tr}Filter{/tr}">
{/capture}
{if $cpt > 1}
<div class="freetagsbrowse">{$smarty.capture.browse}</div>{/if}
{if $cpt > 1}
<div class="freetagsbrowse">{$smarty.capture.browse}</div>
{/if}
</form>
......
This diff is collapsed.
This diff is collapsed.
{* test for caps lock*}
{jq notonready=true}
{literal}
function regCapsLock(e){
var kc = e.keyCode?e.keyCode:e.which;
var sk = e.shiftKey?e.shiftKey:((kc == 16)?true:false);
if(((kc >= 65 && kc <= 90) && !sk)||((kc >= 97 && kc <= 122) && sk))
document.getElementById('divRegCapson').style.visibility = 'visible';
else
document.getElementById('divRegCapson').style.visibility = 'hidden';
}
function regCapsLock(e){
var kc = e.keyCode?e.keyCode:e.which;
var sk = e.shiftKey?e.shiftKey:((kc == 16)?true:false);
if(((kc >= 65 && kc <= 90) && !sk)||((kc >= 97 && kc <= 122) && sk))
document.getElementById('divRegCapson').style.visibility = 'visible';
else
document.getElementById('divRegCapson').style.visibility = 'hidden';
}
var submit_counter = 0;
function match_pass() {
submit_counter += 1;
var ret_msg = document.getElementById('validate');
var pass0 = document.getElementById('oldpass') ? document.getElementById('oldpass').value : "dummy";
var pass1 = document.getElementById('pass1').value;
var pass2 = document.getElementById('pass2').value;
if (submit_counter > 10) {
ret_msg.innerHTML = "<img src='img/icons/exclamation.png' style='vertical-align:middle' alt='Overflow'> {tr}Too many tries{/tr}";
return false;
} else if ((pass0 == '') || (pass1 == '') || (pass2 == '')) {
ret_msg.innerHTML = "<img src='img/icons/exclamation.png' style='vertical-align:middle' alt='Missing'> {tr}Passwords missing{/tr}";
return false;
} else if ( pass1 != pass2 ) {
ret_msg.innerHTML = "<img src='img/icons/exclamation.png' style='vertical-align:middle' alt='Do not match'> {tr}Passwords don\'t match{/tr}";
return false;
}
return true;
var submit_counter = 0;
function match_pass() {
submit_counter += 1;
var ret_msg = document.getElementById('validate');
var pass0 = document.getElementById('oldpass') ? document.getElementById('oldpass').value : "dummy";
var pass1 = document.getElementById('pass1').value;
var pass2 = document.getElementById('pass2').value;
if (submit_counter > 10) {
ret_msg.innerHTML = "<img src='img/icons/exclamation.png' style='vertical-align:middle' alt='Overflow'> {tr}Too many tries{/tr}";
return false;
} else if ((pass0 == '') || (pass1 == '') || (pass2 == '')) {
ret_msg.innerHTML = "<img src='img/icons/exclamation.png' style='vertical-align:middle' alt='Missing'> {tr}Passwords missing{/tr}";
return false;
} else if ( pass1 != pass2 ) {
ret_msg.innerHTML = "<img src='img/icons/exclamation.png' style='vertical-align:middle' alt='Do not match'> {tr}Passwords don\'t match{/tr}";
return false;
}
return true;
}
{/literal}
{/jq}
{if isset($new_user_validation) && $new_user_validation eq 'y'}
{title}{tr}Your account has been validated.{/tr} {tr}You have to choose a password to use this account.{/tr}{/title}
{else}
{assign var='new_user_validation' value='n'}
{title}{tr}Change password enforced{/tr}{/title}
{/if}
<form class="form-horizontal col-md-12" method="post" action="tiki-change_password.php">
{if !empty($oldpass) and $new_user_validation eq 'y'}
<input type="hidden" name="oldpass" value="{$oldpass|escape}">
{elseif !empty($smarty.request.actpass)}
<input type="hidden" name="actpass" value="{$smarty.request.actpass|escape}">
{/if}
<fieldset>{if $new_user_validation neq 'y'}<legend>{tr}Change your password{/tr}</legend>{/if}
<div class="alert alert-warning" id="divRegCapson" style="visibility:hidden">{icon _id=error style="vertical-align:middle"} {tr}CapsLock is on.{/tr}</div>
</fieldset>
<div class="form-group">
<label class="col-sm-3 col-md-2 control-label" for="user">{tr}Username{/tr}</label>
<div class="col-sm-7 col-md-6">
{if empty($userlogin)}
<input type="text" class="form-control" id="user" name="user">
{else}
<input type="hidden" id="user" name="user" value="{$userlogin|escape}">
<div class="form-control-static"><strong>{$userlogin|escape}</strong></div>
{/if}
</div>
</div>
{if empty($smarty.request.actpass) and $new_user_validation neq 'y'}
<div class="form-group">
<label class="col-sm-3 col-md-2 control-label" for="oldpass">{tr}Old Password{/tr}</label>
<div class="col-sm-7 col-md-6">
<input type="password" class="form-control" name="oldpass" id="oldpass" placeholder="Old Password">
</div>
</div>
{/if}
<div class="form-group">
<label class="col-sm-3 col-md-2 control-label" for="pass1">{tr}New Password{/tr}</label>
<div class="col-sm-7 col-md-6">
<input type="password" class="form-control" placeholder="New Password" name="pass" id="pass1"
onkeypress="regCapsLock(event)" onkeyup="runPassword(this.value, 'mypassword');{if 0 and $prefs.feature_ajax eq 'y'}check_pass();{/if}">
</div>
<div class="col-md-4">
<div id="mypassword_text"></div>
<div id="mypassword_bar" style="font-size: 5px; height: 2px; width: 0px;"></div>
</div>
<p class="col-md-4 col-sm-10 help-block">{tr}Minimum 5 characters long.{/tr}</p>
</div>
<div class="form-group">
<label class="col-sm-3 col-md-2 control-label" for="pass2">{tr}Repeat Password{/tr}</label>
<div class="col-sm-7 col-md-6">
<input type="password" class="form-control" name="pass2" id="pass2" placeholder="Repeat Password">
</div>
</div>
{if empty($email)}
<div class="form-group">
<label class="col-sm-3 col-md-2 control-label" for="email">{tr}E-mail{/tr}</label>
<div class="col-sm-7 col-md-6">
<input type="email" class="form-control" name="email" id="email" placeholder="E-mail">
</div>
</div>
{/if}
{if !empty($oldpass) and $new_user_validation eq 'y'}
<input type="hidden" name="oldpass" value="{$oldpass|escape}">
{elseif !empty($smarty.request.actpass)}
<input type="hidden" name="actpass" value="{$smarty.request.actpass|escape}">
{/if}
<fieldset>{if $new_user_validation neq 'y'}<legend>{tr}Change your password{/tr}</legend>{/if}
<div class="alert alert-warning" id="divRegCapson" style="visibility:hidden">{icon _id=error style="vertical-align:middle"} {tr}CapsLock is on.{/tr}</div>
</fieldset>
<div class="form-group">
<label class="col-sm-3 col-md-2 control-label" for="user">{tr}Username{/tr}</label>
<div class="col-sm-7 col-md-6">
{if empty($userlogin)}
<input type="text" class="form-control" id="user" name="user">
{else}
<input type="hidden" id="user" name="user" value="{$userlogin|escape}">
<div class="form-control-static"><strong>{$userlogin|escape}</strong></div>
{/if}
</div>
</div>
{if empty($smarty.request.actpass) and $new_user_validation neq 'y'}
<div class="form-group">
<label class="col-sm-3 col-md-2 control-label" for="oldpass">{tr}Old Password{/tr}</label>
<div class="col-sm-7 col-md-6">
<input type="password" class="form-control" name="oldpass" id="oldpass" placeholder="Old Password">
</div>
</div>
{/if}
<div class="form-group">
<label class="col-sm-3 col-md-2 control-label" for="pass1">{tr}New Password{/tr}</label>
<div class="col-sm-7 col-md-6">
<input type="password" class="form-control" placeholder="New Password" name="pass" id="pass1"
onkeypress="regCapsLock(event)" onkeyup="runPassword(this.value, 'mypassword');{if 0 and $prefs.feature_ajax eq 'y'}check_pass();{/if}">
</div>
<div class="col-md-4">
<div id="mypassword_text"></div>
<div id="mypassword_bar" style="font-size: 5px; height: 2px; width: 0px;"></div>
</div>
<p class="col-md-4 col-sm-10 help-block">{tr}Minimum 5 characters long.{/tr}</p>
</div>
<div class="form-group">
<label class="col-sm-3 col-md-2 control-label" for="pass2">{tr}Repeat Password{/tr}</label>
<div class="col-sm-7 col-md-6">
<input type="password" class="form-control" name="pass2" id="pass2" placeholder="Repeat Password">
</div>
</div>
{if empty($email)}
<div class="form-group">
<label class="col-sm-3 col-md-2 control-label" for="email">{tr}E-mail{/tr}</label>
<div class="col-sm-7 col-md-6">
<input type="email" class="form-control" name="email" id="email" placeholder="E-mail">
</div>
</div>
{/if}
<div class="form-group">
<div class="col-sm-offset-3 col-md-offset-2 col-sm-10">
<input type="submit" class="btn btn-default" name="change" onclick="return match_pass();" value="{tr}Change{/tr}"><span id="validate"></span>
</div>
</div>
<div class="form-group">
<div class="col-sm-offset-3 col-md-offset-2 col-sm-10">
<input type="submit" class="btn btn-default" name="change" onclick="return match_pass();" value="{tr}Change{/tr}"><span id="validate"></span>
</div>
</div>
</form>
This diff is collapsed.
......@@ -7,7 +7,7 @@
<div class="t_navbar btn-group form-group">
{button href="tiki-list_blogs.php" class="btn btn-default" _text="{tr}List Blogs{/tr}"}
{if $blogId > 0}
{if $blogId > 0}
{assign var=thisblogId value=$blogId|sefurl:blog}
{button href=$thisblogId class="btn btn-default" _text="{tr}View Blog{/tr}"}
{/if}
......@@ -26,6 +26,7 @@
<form method="post" action="tiki-edit_blog.php" id="blog-edit-form" class="form-horizontal" role="form">
<input type="hidden" name="blogId" value="{$blogId|escape}">
{tabset name='tabs_editblog'}
{tab name="{tr}General Settings{/tr}"}
<h2>{tr}General Settings{/tr}</h2>
<div class="form-group">
......@@ -84,26 +85,27 @@
<div class="checkbox">
<label for="blogs-post-use-excerpt">
<input type="checkbox" name="use_excerpt" id="blogs-post-use-excerpt" {if $use_excerpt eq 'y'}checked='checked'{/if}>
{tr}Use post excerpt{/tr}
{tr}Use post excerpt{/tr}
</label>
</div>
</div>
</div>
{include file='categorize.tpl'}
{/tab}
{tab name="{tr}Display Options{/tr}"}
<h2>{tr}Display Options{/tr}</h2>
<div class="form-group">
<label class="col-sm-5 control-label" for="blogs-number">{tr}Number of posts to show per page{/tr}</label>
<div class="col-sm-2">
<input type="text" name="maxPosts" id="blogs-number" class="form-control" value="{$maxPosts|escape}">
<input type="text" name="maxPosts" id="blogs-number" class="form-control" value="{$maxPosts|escape}">
</div>
</div>
<div class="form-group">
<div class="col-sm-offset-3 col-sm-9">
<div class="checkbox">
<label for="blogs-title">{tr}Display blog title in posts list page{/tr}
<input type="checkbox" name="use_title" id="blogs-title" {if $use_title eq 'y'}checked='checked'{/if}>
<input type="checkbox" name="use_title" id="blogs-title" {if $use_title eq 'y'}checked='checked'{/if}>
</label>
</div>
<div class="checkbox">
......@@ -146,7 +148,7 @@
</div>
<label class="col-sm-5 control-label" for="blogs-post-max-related">{tr}Maximum number of related posts to display{/tr}</label>
<div class="col-sm-2">
<input type="text" name="related_max" id="blogs-post-max-related" class="form-control" value="{$related_max|escape}">
<input type="text" name="related_max" id="blogs-post-max-related" class="form-control" value="{$related_max|escape}">
</div>
</div>
</div>
......@@ -170,7 +172,8 @@
</div>
</div>
{/if}
{/tab}
{/tab}
{/tabset}
{if $prefs.feature_blog_heading eq 'y' and $tiki_p_edit_templates eq 'y'}
<input type="submit" class="wikiaction btn btn-default" name="preview" value="{tr}Heading preview{/tr}">
......
This diff is collapsed.
......@@ -7,31 +7,31 @@
{/if}
<div class="pull-right btn-group blogactions" >
{if $tiki_p_blog_post eq "y"}
{if ($user and $creator eq $user) or $tiki_p_blog_admin eq "y" or $public eq "y"}
<a class="btn btn-default btn-small bloglink" href="tiki-blog_post.php?blogId={$blogId}" alt="{tr}Post{/tr}" title="{tr}Post{/tr}">{icon name=post}</a>
{/if}
{if $tiki_p_blog_post eq "y"}
{if ($user and $creator eq $user) or $tiki_p_blog_admin eq "y" or $public eq "y"}
<a class="btn btn-default btn-small bloglink" href="tiki-blog_post.php?blogId={$blogId}" alt="{tr}Post{/tr}" title="{tr}Post{/tr}">{icon name=post}</a>
{/if}
{if $prefs.feed_blog eq "y"}
<a class="btn btn-default btn-small bloglink" href="tiki-blog_rss.php?blogId={$blogId}" alt="{tr}RSS feed{/tr}" title="{tr}RSS feed{/tr}">{icon name=rss}</a>
{/if}
{if ($user and $creator eq $user) or $tiki_p_blog_admin eq "y"}
<a class="btn btn-default btn-small bloglink" href="tiki-edit_blog.php?blogId={$blogId}" alt="{tr}Edit Blog{/tr}" title="{tr}Edit Blog{/tr}">{icon name=edit}</a>
{if $allow_comments eq 'y'}
<a class='btn btn-default btn-small bloglink' href='tiki-list_comments.php?types_section=blogs&amp;blogId={$blogId}' alt="{tr}List all comments{/tr}" title="{tr}List all comments{/tr}">{icon name=comments}</a>
{/if}
{/if}
{if $prefs.feed_blog eq "y"}
<a class="btn btn-default btn-small bloglink" href="tiki-blog_rss.php?blogId={$blogId}" alt="{tr}RSS feed{/tr}" title="{tr}RSS feed{/tr}">{icon name=rss}</a>
{/if}
{if ($user and $creator eq $user) or $tiki_p_blog_admin eq "y"}
<a class="btn btn-default btn-small bloglink" href="tiki-edit_blog.php?blogId={$blogId}" alt="{tr}Edit Blog{/tr}" title="{tr}Edit Blog{/tr}">{icon name=edit}</a>
{if $allow_comments eq 'y'}
<a class='btn btn-default btn-small bloglink' href='tiki-list_comments.php?types_section=blogs&amp;blogId={$blogId}' alt="{tr}List all comments{/tr}" title="{tr}List all comments{/tr}">