Commit 52ffc7c8 authored by chibaguy's avatar chibaguy

[FIX][KIL] Improve position of find form, etc.; remove unneeded layout template.

parent c6bcbd4e
......@@ -5172,8 +5172,6 @@ templates/layouts/basic/layout_view.tpl -text
templates/layouts/classic/layout_edit.tpl -text
templates/layouts/classic/layout_view.tpl -text
templates/layouts/classic/module.tpl -text
templates/layouts/h_tb_m_f_containers_3-6-3/layout_edit.tpl -text
templates/layouts/h_tb_m_f_containers_3-6-3/layout_view.tpl -text
templates/layouts/header_middle_footer_containers/layout_edit.tpl -text
templates/layouts/header_middle_footer_containers/layout_view.tpl -text
templates/layouts/header_middle_footer_containers_3-6-3/layout_edit.tpl -text
......
{* $Id$ *}<!DOCTYPE html>
<html lang="{if !empty($pageLang)}{$pageLang}{else}{$prefs.language}{/if}"{if !empty($page_id)} id="page_{$page_id}"{/if}>
<head>
{include file='header.tpl'}
<meta name="viewport" content="width=device-width, initial-scale=1.0">
</head>
<body{html_body_attributes}>
{$cookie_consent_html}
{if $prefs.feature_ajax eq 'y'}
{include file='tiki-ajax_header.tpl'}
{/if}
<div class="header_outer">
<div class="header_container">
<header class="container header page-header">
{modulelist zone=top class='row row-sidemargins-zero'}
</header>
</div>
</div>
<div class="topbar_container">
<div class="container">
{modulelist zone=topbar class='row row-sidemargins-zero topbar' id='tiki-top'}
</div>
</div>
<div class="middle_outer">
<div class="container clearfix middle" id="middle">
<div class="row row-middle">
{if zone_is_empty('left') and zone_is_empty('right')}
{if $prefs.feature_layoutshadows eq 'y'}<div id="tiki-center-shadow">{eval var=$prefs.center_shadow_start}{/if}
<div class="col-md-12" id="col1">
{if $prefs.module_zones_pagetop eq 'fixed' or ($prefs.module_zones_pagetop ne 'n' && ! zone_is_empty('pagetop'))}
{modulelist zone=pagetop}
{/if}
{error_report}
<div class="pull-right">{block name=quicknav}{/block}</div>
{block name=title}{/block}
{block name=navigation}{/block}
{block name=content}{/block}
{if $prefs.module_zones_pagebottom eq 'fixed' or ($prefs.module_zones_pagebottom ne 'n' && ! zone_is_empty('pagebottom'))}
{modulelist zone=pagebottom}
{/if}
</div>
{if $prefs.feature_layoutshadows eq 'y'}{eval var=$prefs.center_shadow_end}</div>{/if}
{elseif zone_is_empty('left')}
{if $prefs.feature_layoutshadows eq 'y'}<div id="tiki-center-shadow">{eval var=$prefs.center_shadow_start}{/if}
<div class="col-md-9" id="col1">
{if $prefs.module_zones_pagetop eq 'fixed' or ($prefs.module_zones_pagetop ne 'n' && ! zone_is_empty('pagetop'))}
{modulelist zone=pagetop}
{/if}
{error_report}
<div class="pull-right">{block name=quicknav}{/block}</div>
{block name=title}{/block}
{block name=navigation}{/block}
{block name=content}{/block}
{if $prefs.module_zones_pagebottom eq 'fixed' or ($prefs.module_zones_pagebottom ne 'n' && ! zone_is_empty('pagebottom'))}
{modulelist zone=pagebottom}
{/if}
</div>
{if $prefs.feature_layoutshadows eq 'y'}{eval var=$prefs.center_shadow_end}</div>{/if}
<div class="col-md-3" id="col3">
{modulelist zone=right}
</div>
{elseif zone_is_empty('right')}
{if $prefs.feature_layoutshadows eq 'y'}<div id="tiki-center-shadow">{eval var=$prefs.center_shadow_start}{/if}
<div class="col-md-9 col-md-push-3" id="col1">
{if $prefs.module_zones_pagetop eq 'fixed' or ($prefs.module_zones_pagetop ne 'n' && ! zone_is_empty('pagetop'))}
{modulelist zone=pagetop}
{/if}
{error_report}
<div class="pull-right">{block name=quicknav}{/block}</div>
{block name=title}{/block}
{block name=navigation}{/block}
{block name=content}{/block}
{if $prefs.module_zones_pagebottom eq 'fixed' or ($prefs.module_zones_pagebottom ne 'n' && ! zone_is_empty('pagebottom'))}
{modulelist zone=pagebottom}
{/if}
</div>
{if $prefs.feature_layoutshadows eq 'y'}{eval var=$prefs.center_shadow_end}</div>{/if}
<div class="col-md-3 col-md-pull-9" id="col2">
{modulelist zone=left}
</div>
{else}
{if $prefs.feature_layoutshadows eq 'y'}<div id="tiki-center-shadow">{eval var=$prefs.center_shadow_start}{/if}
<div class="col-md-6 col-md-push-3" id="col1">
{if $prefs.module_zones_pagetop eq 'fixed' or ($prefs.module_zones_pagetop ne 'n' && ! zone_is_empty('pagetop'))}
{modulelist zone=pagetop}
{/if}
{error_report}
<div class="pull-right">{block name=quicknav}{/block}</div>
{block name=title}{/block}
{block name=navigation}{/block}
{block name=content}{/block}
{if $prefs.module_zones_pagebottom eq 'fixed' or ($prefs.module_zones_pagebottom ne 'n' && ! zone_is_empty('pagebottom'))}
{modulelist zone=pagebottom}
{/if}
</div>
{if $prefs.feature_layoutshadows eq 'y'}{eval var=$prefs.center_shadow_end}</div>{/if}
<div class="col-md-3 col-md-pull-6" id="col2">
{modulelist zone=left}
</div>
<div class="col-md-3" id="col3">
{modulelist zone=right}
</div>
{/if}
</div>
</div>
</div>
<footer class="footer" id="footer">
<div class="footer_liner">
<div class="footerbgtrap container">
{modulelist zone=bottom class='row row-sidemargins-zero'}
</div>
</div>
</footer>
{include file='footer.tpl'}
</body>
</html>
{if !empty($smarty.request.show_smarty_debug)}
{debug}
{/if}
......@@ -29,6 +29,8 @@
</form>
{/if}
{if $prefs.feature_forums_search eq 'y' and $prefs.feature_search eq 'y'}
<div class="row margin-bottom-md">
<div class="col-md-5 col-md-offset-7">
<form class="form" method="get" role="form" action="{if $prefs.feature_search_fulltext neq 'y'}tiki-searchindex.php{else}tiki-searchresults.php{/if}">
<div class="form-group">
<div class="input-group">
......@@ -44,6 +46,7 @@
</div>
</div>
</form>
</div></div>
{/if}
{/if}
{/if}
......
......@@ -363,7 +363,8 @@
</div> <!-- end forumpost -->
{/if}
{if $prefs.feature_forum_content_search eq 'y' and $prefs.feature_search eq 'y'}
<div class="text-center form-group">
<div class="row margin-bottom-md">
<div class="col-md-5 col-md-offset-7">
<form id="search-form" class="form" role="form" method="get" action="tiki-search{if $prefs.feature_forum_local_tiki_search eq 'y'}index{else}results{/if}.php">
<div class="form-group">
<div class="input-group">
......@@ -380,6 +381,7 @@
</div>
</form>
</div>
</div>
{/if}
{/if}
<form id="view_forum" method="post" action="tiki-view_forum.php">
......
......@@ -5,7 +5,7 @@
{if $prefs.feature_forum_topics_archiving eq 'y' && $thread_info.archived eq 'y'}({tr}Archived{/tr}){/if}
{/title}
<div class="t_navbar btn-group form-group">
<div class="t_navbar btn-group margin-bottom-md">
{if $tiki_p_admin_forum eq "y"}
{button href="tiki-admin_forums.php?forumId=$forumId" class="btn btn-default" _text="{tr}Edit Forum{/tr}"}
{/if}
......@@ -23,7 +23,7 @@
{if $post_reported eq 'y'}
{remarksbox type=warning title="{tr}The post has been reported and will be reviewed by a moderator.{/tr}"}{/remarksbox}
{/if}
<br>
<div id="thread-breadcrumb" class="breadcrumb">
<a class="link" href="tiki-forums.php">
{tr}Forums{/tr}
......@@ -41,7 +41,7 @@
{$thread_info.title|escape}
</div>
<div style="text-align: right; margin-bottom: 15px;">
<div class="text-right margin-bottom-md">
{if empty($thread_info.topic.threadId)}
<span>
{if ($prev_topic and $prev_topic ne $comments_parentId) or $next_topic}[ {if $prev_topic and $prev_topic ne $comments_parentId}<a href="tiki-view_forum_thread.php?comments_parentId={$prev_topic}&amp;topics_offset={$topics_prev_offset}{$topics_sort_mode_param}{$topics_threshold_param}{$topics_find_param}{$comments_per_page_param}{$thread_style_param}{$thread_sort_mode_param}{$comments_threshold_param}" class="link">{tr}prev topic{/tr}</a>{if $next_topic} | {/if}{/if}
......@@ -52,7 +52,7 @@
{tr}You are viewing a reply to{/tr} <a class="link" href="tiki-view_forum_thread.php?comments_parentId={$thread_info.topic.threadId}{if $smarty.request.topics_offset}&amp;topics_offset={$smarty.request.topics_offset}{/if}{$topics_sort_mode_param}{$topics_threshold_param}{$topics_find_param}">{$thread_info.topic.title}</a>
</span>
{/if}
<span style="margin-left:10px;">
&nbsp;
<div class="btn-group">
<a class="btn btn-link" data-toggle="dropdown" data-hover="dropdown" href="#">
{icon name="ellipsis"}
......@@ -107,7 +107,7 @@
{/if}
</ul>
</div>
</span>
</div>
......
......@@ -7242,9 +7242,6 @@ div.drillshow {
box-shadow: inset 0 24px 0 0 #28a7de;
border-top: 2px solid #fff;
}
.layout_h_tb_m_f_containers_3-6-3 .middle_outer {
background: #ffffff;
}
#top_modules {
max-height: 54px;
}
......@@ -7276,7 +7273,6 @@ div.drillshow {
.topbar_container {
background: #28aae1;
}
.layout_h_tb_m_f_containers_3-6-3 .navbar,
.layout_moving_headers .navbar {
margin-bottom: 0;
}
......
......@@ -23,9 +23,10 @@
// border-top: 2px solid #fff;
}
.layout_h_tb_m_f_containers_3-6-3 .middle_outer {
background: #ffffff;
}
// Layout template removed
//.layout_h_tb_m_f_containers_3-6-3 .middle_outer {
// background: #ffffff;
//}
// @navbar-default-link-background: #bfbd23;
.navbar-nav .open .dropdown-menu,
......
......@@ -15,13 +15,14 @@
border-top: 2px solid #fff;
}
.layout_h_tb_m_f_containers_3-6-3 .middle_outer/*,
.layout_moving_headers .middle_outer*/ {
background: #ffffff;
.navbar {
// min-height: 1;
}
}
// Layout template removed.
//.layout_h_tb_m_f_containers_3-6-3 .middle_outer/*,
//.layout_moving_headers .middle_outer*/ {
// background: #ffffff;
// .navbar {
// // min-height: 1;
// }
//}
#top_modules {
max-height: 54px;
......@@ -62,7 +63,7 @@
background: @topbar_container_background;
}
.layout_h_tb_m_f_containers_3-6-3 .navbar,
// .layout_h_tb_m_f_containers_3-6-3 .navbar,
.layout_moving_headers .navbar {
// min-height: ;
margin-bottom: 0;
......
......@@ -545,9 +545,6 @@ hr {
.topbar_container {
background: #a82a76;
}
.layout_h_tb_m_f_containers_3-6-3 .middle_outer {
background: #ffffff;
}
.navbar-nav .open .dropdown-menu,
.navbar-nav .open .dropdown-menu li,
.navbar-default .navbar-nav > li > a {
......
......@@ -545,9 +545,6 @@ hr {
.topbar_container {
background: #cdbe23;
}
.layout_h_tb_m_f_containers_3-6-3 .middle_outer {
background: #ffffff;
}
.navbar-nav .open .dropdown-menu,
.navbar-nav .open .dropdown-menu li,
.navbar-default .navbar-nav > li > a {
......
......@@ -545,9 +545,6 @@ hr {
.topbar_container {
background: #ffc506;
}
.layout_h_tb_m_f_containers_3-6-3 .middle_outer {
background: #ffffff;
}
.navbar-nav .open .dropdown-menu,
.navbar-nav .open .dropdown-menu li,
.navbar-default .navbar-nav > li > a {
......
......@@ -545,9 +545,6 @@ hr {
.topbar_container {
background: #c74323;
}
.layout_h_tb_m_f_containers_3-6-3 .middle_outer {
background: #ffffff;
}
.navbar-nav .open .dropdown-menu,
.navbar-nav .open .dropdown-menu li,
.navbar-default .navbar-nav > li > a {
......
......@@ -545,9 +545,6 @@ hr {
.topbar_container {
background: #49006c;
}
.layout_h_tb_m_f_containers_3-6-3 .middle_outer {
background: #ffffff;
}
.navbar-nav .open .dropdown-menu,
.navbar-nav .open .dropdown-menu li,
.navbar-default .navbar-nav > li > a {
......
......@@ -545,9 +545,6 @@ hr {
.topbar_container {
background: #e60b7f;
}
.layout_h_tb_m_f_containers_3-6-3 .middle_outer {
background: #ffffff;
}
.navbar-nav .open .dropdown-menu,
.navbar-nav .open .dropdown-menu li,
.navbar-default .navbar-nav > li > a {
......
......@@ -545,9 +545,6 @@ hr {
.topbar_container {
background: #c31e3b;
}
.layout_h_tb_m_f_containers_3-6-3 .middle_outer {
background: #ffffff;
}
.navbar-nav .open .dropdown-menu,
.navbar-nav .open .dropdown-menu li,
.navbar-default .navbar-nav > li > a {
......
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