Skip to content

Commit c657b3b

Browse files
author
Phil Bayfield
committed
Merge branch 'develop'
2 parents 2d81267 + 2fc05f1 commit c657b3b

7 files changed

Lines changed: 67 additions & 54 deletions

File tree

‎admin/template/about.tpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
</div>
55
<div id="configContent" style="margin: 0 auto; max-width: 420px">
66
<h3>{'Bootstrap Default'|@translate}</h3>
7-
<h4>{'Version'|@translate}: 1.0.1</h4>
7+
<h4>{'Version'|@translate}: 1.0.2</h4>
88
<h5>{'By'|@translate}: <a href="https://philio.me">Phil Bayfield</a></h5>
99

1010
<p>{'A modern and responsive theme for Piwigo built with standard Bootstrap components and using the default Bootstrap theme. Intended for easy customisation using Bootstrap styles or as a parent theme for creating responsive themes for Piwigo.'|@translate}</p>

‎admin/template/changelog.tpl‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,13 @@
33
<h2>{'Bootstrap Default'|@translate} {$TABSHEET_TITLE}</h2>
44
</div>
55
<div id="configContent">
6+
<fieldset class="mainConf">
7+
<legend>1.0.2</legend>
8+
<ul>
9+
<li>{'Fixed '|@translate} <a href="https://github.com/Philio/bootstrapdefault/issues/14" target="_blank">#14</a> - {"Rating stars appear above side bar"|@translate}</li>
10+
<li>{'Fixed '|@translate} <a href="https://github.com/Philio/bootstrapdefault/issues/16" target="_blank">#16</a> - {"Side bar not correctly hidden in Safari"|@translate}</li>
11+
</ul>
12+
</fieldset>
613
<fieldset class="mainConf">
714
<legend>1.0.1</legend>
815
<ul>

‎less/theme.less‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
@import (reference) "../bootstrap/less/bootstrap.less";
22
@import (reference) "../selectize.js/src/less/selectize.bootstrap3.less";
33

4-
body {
4+
div#the_page {
5+
position: relative;
56
overflow-x: hidden;
67
}
78

@@ -175,6 +176,7 @@ body {
175176
position: absolute;
176177
right: -250px;
177178
text-align: left;
179+
z-index: 10000;
178180
.handle {
179181
margin-top: 30px;
180182
float: right;

‎template/footer.tpl‎

Lines changed: 30 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,37 @@
1-
<!-- Start of footer.tpl -->
2-
<div class="copyright container">
3-
<div class="text-center">
4-
{if isset($debug.TIME)}
5-
{'Page generated in'|@translate} {$debug.TIME} ({$debug.NB_QUERIES} {'SQL queries in'|@translate} {$debug.SQL_TIME}) -
6-
{/if}
7-
{*
8-
Please, do not remove this copyright. If you really want to,
9-
contact us on http://piwigo.org to find a solution on how
10-
to show the origin of the script...
11-
*}
12-
{'Powered by'|@translate} <a href="{$PHPWG_URL}" class="Piwigo">Piwigo</a> | Bootstrap Default {'theme by'|@translate} <a href="https://philio.me/">Phil Bayfield</a>
13-
{$VERSION}
14-
{if isset($CONTACT_MAIL)}
15-
| <a href="mailto:{$CONTACT_MAIL}?subject={'A comment on your site'|@translate|@escape:url}">{'Contact webmaster'|@translate}</a>
16-
{/if}
17-
{if isset($TOGGLE_MOBILE_THEME_URL)}
18-
| {'View in'|@translate} : <a href="{$TOGGLE_MOBILE_THEME_URL}">{'Mobile'|@translate}</a> | <b>{'Desktop'|@translate}</b>
19-
{/if}
1+
<!-- Start of footer.tpl -->
2+
<div class="copyright container">
3+
<div class="text-center">
4+
{if isset($debug.TIME)}
5+
{'Page generated in'|@translate} {$debug.TIME} ({$debug.NB_QUERIES} {'SQL queries in'|@translate} {$debug.SQL_TIME}) -
6+
{/if}
7+
{*
8+
Please, do not remove this copyright. If you really want to,
9+
contact us on http://piwigo.org to find a solution on how
10+
to show the origin of the script...
11+
*}
12+
{'Powered by'|@translate} <a href="{$PHPWG_URL}" class="Piwigo">Piwigo</a> | Bootstrap Default {'theme by'|@translate} <a href="https://philio.me/">Phil Bayfield</a>
13+
{$VERSION}
14+
{if isset($CONTACT_MAIL)}
15+
| <a href="mailto:{$CONTACT_MAIL}?subject={'A comment on your site'|@translate|@escape:url}">{'Contact webmaster'|@translate}</a>
16+
{/if}
17+
{if isset($TOGGLE_MOBILE_THEME_URL)}
18+
| {'View in'|@translate} : <a href="{$TOGGLE_MOBILE_THEME_URL}">{'Mobile'|@translate}</a> | <b>{'Desktop'|@translate}</b>
19+
{/if}
2020

21-
{get_combined_scripts load='footer'}
21+
{get_combined_scripts load='footer'}
2222

23-
{if isset($footer_elements)}
24-
{foreach from=$footer_elements item=v}
25-
{$v}
26-
{/foreach}
27-
{/if}
23+
{if isset($footer_elements)}
24+
{foreach from=$footer_elements item=v}
25+
{$v}
26+
{/foreach}
27+
{/if}
28+
</div>
2829
</div>
29-
</div>
3030
{if isset($debug.QUERIES_LIST)}
31-
<div id="debug">
32-
{$debug.QUERIES_LIST}
33-
</div>
31+
<div id="debug">
32+
{$debug.QUERIES_LIST}
33+
</div>
3434
{/if}
35+
</div>
3536
</body>
3637
</html>

‎template/header.tpl‎

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -80,30 +80,31 @@
8080
</head>
8181

8282
<body id="{$BODY_ID}">
83-
<!-- Bootstrap navbar, moved to the header as variables are missing in menubar.tpl, actual menus remain in menubar.tpl -->
84-
<nav class="navbar navbar-default" role="navigation">
85-
<div class="container">
86-
<div class="navbar-header">
87-
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#menubar-navbar-collapse">
88-
<span class="sr-only">Toggle navigation</span>
89-
<span class="icon-bar"></span>
90-
<span class="icon-bar"></span>
91-
<span class="icon-bar"></span>
92-
</button>
93-
<a class="navbar-brand" href="{$U_HOME}">{$GALLERY_TITLE}</a>
94-
</div>
95-
<div class="collapse navbar-collapse navbar-right" id="menubar-navbar-collapse">
83+
<div id="the_page">
84+
<!-- Bootstrap navbar, moved to the header as variables are missing in menubar.tpl, actual menus remain in menubar.tpl -->
85+
<nav class="navbar navbar-default" role="navigation">
86+
<div class="container">
87+
<div class="navbar-header">
88+
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#menubar-navbar-collapse">
89+
<span class="sr-only">Toggle navigation</span>
90+
<span class="icon-bar"></span>
91+
<span class="icon-bar"></span>
92+
<span class="icon-bar"></span>
93+
</button>
94+
<a class="navbar-brand" href="{$U_HOME}">{$GALLERY_TITLE}</a>
95+
</div>
96+
<div class="collapse navbar-collapse navbar-right" id="menubar-navbar-collapse">
9697
{$MENUBAR}
97-
</div>
98-
</div>
99-
</nav>
98+
</div>
99+
</div>
100+
</nav>
100101

101102
{if !isset($slideshow)}
102-
<div class="jumbotron">
103-
<div class="container">
104-
<div id="theHeader">{$PAGE_BANNER}</div>
105-
</div>
106-
</div>
103+
<div class="jumbotron">
104+
<div class="container">
105+
<div id="theHeader">{$PAGE_BANNER}</div>
106+
</div>
107+
</div>
107108
{/if}
108109

109110
{if not empty($header_msgs)}

‎theme.css‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,8 @@
8080
.modal-footer:after {
8181
clear: both;
8282
}
83-
body {
83+
div#the_page {
84+
position: relative;
8485
overflow-x: hidden;
8586
}
8687
#quickconnect .form-control {
@@ -250,6 +251,7 @@ fieldset[disabled] .html-radios-inline label {
250251
position: absolute;
251252
right: -250px;
252253
text-align: left;
254+
z-index: 10000;
253255
}
254256
#sidebar .handle {
255257
margin-top: 30px;

‎themeconf.inc.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/*
33
Theme Name: Bootstrap Default
4-
Version: 1.0.1
4+
Version: 1.0.2
55
Description: A modern and responsive theme for Piwigo built with standard Bootstrap components and using the default Bootstrap theme. Intended for easy customisation using Bootstrap styles or as a parent theme for creating responsive themes for Piwigo.
66
Theme URI: http://piwigo.org/ext/extension_view.php?eid=796
77
Author: Phil Bayfield

0 commit comments

Comments
 (0)