Skip to content

Commit

Permalink
Various fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@BlackSkorpio
BlackSkorpio committed Oct 9, 2017
1 parent a08a7ff commit aa5039f
Show file tree
Hide file tree
Showing 12 changed files with 1,743 additions and 82 deletions.
37 changes: 18 additions & 19 deletions OxyGen/albums.lens
View file
Original file line number Diff line number Diff line change
@@ -1,23 +1,22 @@
<koken:include file="inc/components/header.html" />
<main role="main">
<koken:load limit="{{ settings.albums_index_limit }}" infinite="true">
<ul class="grid">
<koken:loop>
<li>
<koken:link title="{{ language.view }} {{ album.title }}">
<koken:img size="{{ settings.grid_asp_ratio }}" lazy="true" />
<div>
<h3>{{ album.title }}</h3>
</div>
</koken:link>
</li>
</koken:loop>
</ul>
<koken:else>
<koken:note>
<strong>No albums found.</strong> Create some in the Library.
</koken:note>
</koken:load>
<koken:include file="inc/components/loading_msg.html" />
<koken:load limit="{{ settings.albums_index_limit }}" infinite="true">
<ul class="grid">
<koken:loop>
<li>
<koken:link title="{{ language.view }} {{ album.title }}">
<koken:img size="{{ settings.grid_asp_ratio }}" lazy="true" />
<div>
<h3>{{ album.title }}</h3>
</div>
</koken:link>
</li>
</koken:loop>
</ul>
<koken:else>
<koken:note>
<strong>No albums found.</strong> Create some in the Library.
</koken:note>
</koken:load>
</main>
<koken:include file="inc/components/footer_none.html" />
1,527 changes: 1,526 additions & 1 deletion OxyGen/css/settings.css.lens
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion OxyGen/inc/components/album_cover.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
</koken:if>
</p>
<koken:if data="settings.album_cover_title" equals="true">
<h1 class="album-name">{{ album.title }}</h1>
<h1>{{ album.title }}</h1>
</koken:if>
<koken:if data="settings.album_cover_description" equals="true">
<p class="album-desc">{{ album.description paragraphs="true" }}</p>
Expand Down
15 changes: 9 additions & 6 deletions OxyGen/inc/components/content_cover.html
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
<koken:background lazy="true" id="cover_bg" style="margin-top: 0;">
<div class="cover_inside cover_style_1">
<div class="cover_content">
<koken:if data="location.template" equals="contents">
<p class="album-name">{{ language.content }}</p>
</koken:if>
<koken:if data="location.template" equals="favorites">
<p class="album-name">{{ language.favorites }}</p>
</koken:if>
<h1>
<koken:if data="location.template" equals="contents">
{{ language.content }}
</koken:if>
<koken:if data="location.template" equals="favorites">
{{ language.favorites }}
</koken:if>
</h1>
</div>
<a id="cover_scroll" href="#content" data-bind-to-key="right" class="cover_scroll_link no_b"><i class="icon-{{ settings.album_cover_downarrow }}-down"></i></a>
</div>
</koken:background>
<koken:include file="inc/cover.html" />
1 change: 1 addition & 0 deletions OxyGen/inc/components/footer_none.html
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
<koken:include file="inc/components/loading_msg.html" />
<koken:asset file="inc/js/oxygen.min.js" />
</body>
</html>
30 changes: 10 additions & 20 deletions OxyGen/inc/components/header.html
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,11 @@
<!DOCTYPE html>
<head>
<!--
//
// {{ site.theme.name }} v{{ site.theme.version }} //
// Design and development
// {{ site.author.name }} - baldursphotography@gmail.com
// Github: https://github.com/Koken-Community-Support
// Website: {{ site.author.link }}
// Bjarne Varoystrand - http://varoystrand.se/
// Christopher Bayer - https://github.com/Hard-One/
//
-->
<!-- {{ site.theme.name }} v{{ site.theme.version }} -->
<!-- Design and development -->
<!-- Github: https://github.com/Koken-Community-Support -->
<!-- Website: {{ site.documentation }} -->
<!-- Bjarne Varöystrand - varoystrand.se | github.com/BlackSkorpio -->
<!-- Christopher Bayer - bay3r.de | github.com/Hard-One -->
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<koken:meta />
Expand All @@ -19,29 +14,24 @@
<koken:settings />
<koken:asset file="font-awesome.min.css" common="true" />
</head>
<koken:if data="settings.menu_type" equals="regular">
<body id="regular">
</koken:if>
<koken:if data="settings.menu_type" equals="expanded">
<body id="regular" class="expanded">
</koken:if>
<body id="regular" class="{{ settings.menu_type }}">
<koken:link to="front" title="{{ language.home }}">
<koken:if data="settings.site_title_type" equals="combi">
<koken:if data="location.here" equals="/">
<img src="{{ settings.site_title_img_url }}" alt="{{ site.title }} - {{ site.tagline }}" id="logo">
<koken:else>
<koken:not empty="settings.site_title_combi_img_url">
<h1 id="sitename_combi">{{ site.title }}</h1>
<h1 id="sitename_combi" class="sitename">{{ site.title }}</h1>
<koken:else>
<h1 id="sitename">{{ site.title }}</h1>
<h1 id="sitename" class="sitename">{{ site.title }}</h1>
</koken:not>
</koken:if>
</koken:if>
<koken:if data="settings.site_title_type" equals="text">
<koken:if true="settings.show_tagline">
<span class="tagline">{{ site.tagline }}</span>
</koken:if>
<h1 id="sitename">{{ site.title }}</h1>
<h1 id="sitename" class="sitename">{{ site.title }}</h1>
</koken:if>
<koken:if data="settings.site_title_type" equals="image">
<img src="{{ settings.site_title_img_url }}" alt="{{ site.title }} - {{ site.tagline }}" id="logo">
Expand Down
24 changes: 1 addition & 23 deletions OxyGen/inc/cover.html
View file
Original file line number Diff line number Diff line change
@@ -1,23 +1 @@
<script>
function sizeCover() {
var wh = $(window).height(),
fh = 0,
ph = parseInt($('#container').css('paddingTop')),
hh = $('header.main').is(':visible') ? $('header.main').outerHeight() : 0;

if ($('footer.main').is(':visible')) {
fh = $('footer.main').css('position') === "fixed" ? $('footer.main').outerHeight() : 0;
}

$('header.cover').css({'height': wh - hh - fh - ph});
}

$(document).ready(function(){
sizeCover();
$(".cover_inside h1").fitText(1.2, { minFontSize: '{{ settings.cover_title_min}}px', maxFontSize: '{{ settings.cover_title_max}}px' });
});

$(window).on('resize', function(e) {
sizeCover();
});
</script>
<script>(function(b,a,c,d){b.OxyGenCovers={};OxyGenCovers.init=function(){OxyGenCovers.cacheSelectors();OxyGenCovers.setCoverHeight();OxyGenCovers.sizeCoverTitle()};OxyGenCovers.cacheSelectors=function(){OxyGenCovers.window=c(b);OxyGenCovers.expanded=c("header.expanded");OxyGenCovers.cover=c("header.cover");OxyGenCovers.h1title=c(".cover_inside h1")};OxyGenCovers.setCoverHeight=function(){var e=OxyGenCovers.window.outerHeight()-OxyGenCovers.expanded.outerHeight();OxyGenCovers.cover.css("height",e)};OxyGenCovers.sizeCoverTitle=function(){OxyGenCovers.h1title.fitText(1.2,{minFontSize:"{{ settings.cover_title_min}}px",maxFontSize:"{{ settings.cover_title_max}}px"})};c(a).on("ready",OxyGenCovers.init),c(b).on("resize",OxyGenCovers.init)})(window,document,jQuery);</script>
30 changes: 30 additions & 0 deletions OxyGen/inc/cover.html.js
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
(function(window, document, $, undefined){
window.OxyGenCovers = {};

OxyGenCovers.init = function() {
OxyGenCovers.cacheSelectors();
OxyGenCovers.setCoverHeight();
OxyGenCovers.sizeCoverTitle();
}

OxyGenCovers.cacheSelectors = function() {
OxyGenCovers.window = $(window);
OxyGenCovers.expanded = $("header.expanded");
OxyGenCovers.cover = $("header.cover");
OxyGenCovers.h1title = $(".cover_inside h1");
}

OxyGenCovers.setCoverHeight = function() {
var windowHeight = OxyGenCovers.window.outerHeight() - OxyGenCovers.expanded.outerHeight();
OxyGenCovers.cover.css("height",windowHeight);
}

OxyGenCovers.sizeCoverTitle = function() {
OxyGenCovers.h1title.fitText(1.2,{
minFontSize:"{{ settings.cover_title_min}}px",
maxFontSize:"{{ settings.cover_title_max}}px"
})
}
$(document).on("ready",OxyGenCovers.init),
$(window).on("resize",OxyGenCovers.init);
})(window, document, jQuery);
1 change: 0 additions & 1 deletion OxyGen/inc/js/jquery.fittext.min.js
View file

This file was deleted.

7 changes: 0 additions & 7 deletions OxyGen/inc/js/jquery.scrollTo.min.js
View file

This file was deleted.

8 changes: 4 additions & 4 deletions OxyGen/info.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "OxyGen",
"version": "2.3.2",
"version": "2.3.3",
"description": "OxyGen is a fully responsive theme for your Koken site, ensuring that you give your visitors the best experience of your content.\n\nOxyGen is built for both artist and writers alike giving you the most flexibility so you can concentrate on the asset that is important: your content.",
"demo": "https://demo.kokensupport.com/",
"terms": "Released under GNU GPLv3 license",
Expand Down Expand Up @@ -511,7 +511,7 @@
{ "option": "cover_styles", "equals": "image_cover" }
]
},
"scope": [ "album", "set" ]
"scope": [ "album", "contents", "favorites", "set" ]
},
"cover_title_max": {
"label": "Title max size",
Expand All @@ -527,7 +527,7 @@
{ "option": "cover_styles", "equals": "image_cover" }
]
},
"scope": [ "album", "set" ]
"scope": [ "album", "contents", "favorites", "set" ]
},
"cover_title_ls": {
"label": "Title spacing",
Expand All @@ -543,7 +543,7 @@
{ "option": "cover_styles", "equals": "image_cover" }
]
},
"scope": [ "album", "set" ]
"scope": [ "album", "contents", "favorites", "set" ]
},
"album_cover_description": {
"label": "Album description",
Expand Down
143 changes: 143 additions & 0 deletions OxyGen/lightbox.lens
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,143 @@
<koken:if true="pjax">
<koken:title />
<koken:else>
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0" />

<koken:title />

<koken:asset file="lightbox.css" common="true" />

<koken:settings />
</head>

<body id="k-lightbox" class="loading">

<div id="lbox">

</koken:if>

<koken:load>

<koken:head>
<meta property="og:site_name" content="{{ site.title }}" />
<meta property="og:type" content="website" />
<meta property="og:url" content="{{ content.url }}" />
<meta property="og:title" content="{{ content.title | content.filename strip_html="true" }}" />
<meta property="og:description" content="{{ content.caption strip_html="true" }}" />
<meta property="og:image" content="{{ content.presets.medium_large.url }}" />
<meta property="og:image:width" content="{{ content.presets.medium_large.width }}" />
<meta property="og:image:height" content="{{ content.presets.medium_large.height }}" />
<koken:content_image>
<koken:not empty="profile.twitter">
<meta name="twitter:card" content="photo" />
<meta name="twitter:site" content="@{{ profile.twitter }}" />
<meta name="twitter:creator" content="@{{ profile.twitter }}" />
</koken:not>
</koken:content_image>
</koken:head>

<a href="#" title="{{ language.close_lightbox }}" id="lbox-bttn-close" class="ibutton"><i class="icon-remove-sign"></i></a>

<a href="#" title="{{ language.view_fullscreen }}" id="lbox-bttn-fs" class="ibutton"><i class="icon-fullscreen"></i></a>

<a href="#" title="{{ language.exit_fullscreen }}" id="lbox-bttn-ns" class="ibutton"><i class="icon-resize-small"></i></a>

<div id="lnav" class="tnav">
<koken:previous>
<koken:link lightbox="true" bind_to_key="left" title="{{ language.view_previous }}">
<span class="ibutton"><i class="icon-angle-left"></i></span>
</koken:link>
</koken:previous>
</div>

<div id="tl_controls">
<koken:next>
<a href="#" id="lbox-bttn-play" class="ibutton" title="{{ language.start_slideshow }}">
<i class="icon-play icon-large"></i>
</a>
</koken:next>

<a href="#" id="lbox-bttn-pause" class="ibutton" title="{{ language.stop_slideshow }}">
<i class="icon-pause icon-large"></i>
</a>

<koken:rating>
<div id="lbox_rating">
{{ rating }}
</div>
</koken:rating>

<div id="lbox_share">
<div class="lbox_toggle">
<a href="#" id="lbox-bttn-share" class="ibutton" title="{{ language.share_this }}">
<i class="icon-export-alt icon-large"></i>
</a>
<div id="lbox_share_menu">
<ul class="social-links kshare">
<li><koken:link share="twitter" class="ibutton share-twitter"><i class="icon-twitter"></i></koken:link></li><li><koken:link share="facebook" class="ibutton share-facebook"><i class="icon-facebook"></i></koken:link></li><li><koken:link share="pinterest" class="ibutton share-pinterest"><i class="icon-pinterest"></i></koken:link></li><li><koken:link share="tumblr" class="ibutton share-tumblr"><i class="icon-tumblr"></i></koken:link></li><li><koken:link share="google-plus" class="ibutton share-google"><i class="icon-gplus"></i></koken:link></li><koken:max_download><li><koken:link class="ibutton share-dl no-share" title="{{ language.download }} {{ max_download.width }} x {{ max_download.height }}"><i class="icon-download-alt"></i></koken:link></li></koken:max_download>
</ul>
</div>
</div>
</div>
</div>

<div id="main">

<div class="spinner_pos active"><div class="spinner"></div></div>

<div id="content">

<koken:parent>
<script>
window.albumId = {{ album.id }};
</script>
</koken:parent>

<script>
window.theContent = {{ content.to_json fields="aspect_ratio,id,presets,file_type,original,html,visibility" }};
</script>

<div class="caption" style="display:none">
<strong>{{ content.title }}</strong>
&nbsp;
{{ content.caption }}
</div>

</div>

</div>

<div id="rnav" class="tnav">
<koken:next>
<koken:link lightbox="true" bind_to_key="right" title="{{ language.view_next }}">
<span class="ibutton"><i class="icon-angle-right"></i></span>
</koken:link>
</koken:next>
</div>

<footer>

<koken:link to="front" title="{{ site.title }}">{{ site.title }}</koken:link><koken:parent>&nbsp;&nbsp;/&nbsp;&nbsp;<koken:link to="album" filter:id="{{ album.id }}">{{ album.title }}</koken:link>&nbsp;&nbsp;/&nbsp;&nbsp;{{ _parent.content.context.position }} {{ language.of }} {{ album.counts.total }}<koken:else>&nbsp;&nbsp;/&nbsp;&nbsp;<koken:context><koken:if data="context.type" equals="favorite"><koken:link to="favorites">{{ language.favorites }}</koken:link><koken:else><koken:if data="context.type" equals="tag"><koken:link>#{{ context.title }}</koken:link><koken:else><koken:link>{{ context.title }}</koken:link></koken:if> </koken:if> &nbsp;&nbsp;/&nbsp;&nbsp;{{ context.position }} {{ language.of }} {{ context.total }} <koken:else><koken:link to="contents">{{ language.content }}</koken:link> </koken:context></koken:parent>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span id="caption-bttns"><a class="btn-toggle show" href="#" title="{{ language.show_caption }}">{{ language.show_caption }}</a><a class="btn-toggle hide" href="#" title="{{ language.hide_caption }}" style="display:none">{{ language.hide_caption }}</a></span>

</footer>

</koken:load>

</div> <!-- close lbox -->

<koken:if true="pjax">
<script>update();</script>
<koken:else>

<koken:asset file="jquery.pjax.js" common="true" />
<koken:asset file="lightbox.js" common="true" />

</body>

</html>

</koken:if>

0 comments on commit aa5039f

Please sign in to comment.