Skip to content
This repository has been archived by the owner on Apr 29, 2024. It is now read-only.

Commit

Permalink
Merge pull request #7 from othercodes/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
othercodes authored Jan 8, 2020
2 parents 8ca8e70 + 0984ec6 commit 4097625
Show file tree
Hide file tree
Showing 38 changed files with 3,904 additions and 20 deletions.
1 change: 1 addition & 0 deletions VERSION
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
1.2.0
37 changes: 37 additions & 0 deletions blueprints/styles/banner.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
name: Banner Styles
description: Banner section styles for the otherCode theme
type: section

form:
fields:

background:
type: input.colorpicker
label: Background
default: "#ffffff"
text-color:
type: input.colorpicker
label: Text
default: "#444444"
background-image:
type: input.imagepicker
label: Background Image
default: 'gantry-media://bottom/bottom-001.jpg'
background-overlay:
type: select.select
label: Background Overlay
description: 'Enables the overlay made of background color.'
placeholder: 'Select...'
default: enabled
options:
enabled: Enabled
disabled: Disabled
background-parallax:
type: select.select
label: Parallax Effect
description: 'Enables the CSS based parallax effect.'
placeholder: 'Select...'
default: enabled
options:
enabled: Enabled
disabled: Disabled
15 changes: 15 additions & 0 deletions blueprints/styles/slide.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
name: Slide Styles
description: Slide section content styles for the otherCode theme
type: section

form:
fields:

background:
type: input.colorpicker
label: Background
default: "#ffffff"
text-color:
type: input.colorpicker
label: Text
default: "#444444"
37 changes: 37 additions & 0 deletions blueprints/styles/testimonials.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
name: Testimonials Styles
description: Testimonials section styles for the otherCode theme
type: section

form:
fields:

background:
type: input.colorpicker
label: Background
default: "#ffffff"
text-color:
type: input.colorpicker
label: Text
default: "#444444"
background-image:
type: input.imagepicker
label: Background Image
default: 'gantry-media://bottom/bottom-001.jpg'
background-overlay:
type: select.select
label: Background Overlay
description: 'Enables the overlay made of background color.'
placeholder: 'Select...'
default: enabled
options:
enabled: Enabled
disabled: Disabled
background-parallax:
type: select.select
label: Parallax Effect
description: 'Enables the CSS based parallax effect.'
placeholder: 'Select...'
default: enabled
options:
enabled: Enabled
disabled: Disabled
34 changes: 17 additions & 17 deletions build.sh
Original file line number Diff line number Diff line change
@@ -1,39 +1,39 @@
#!/usr/bin/env bash

ext_path=`pwd`
ext_path=$(pwd)
ext_name="g5_othercode"
version="1.1.2"
version=$(cat VERSION)

echo "**********************"
echo "Building: "$ext_name
echo "Version: "$version
echo "Building: ${ext_name}"
echo "Version: ${version}"
echo "**********************"
echo "Path: "$ext_path
echo "Path: ${ext_path}"
echo "**********************"

echo "Cleaning..."
cd $ext_path
rm -rf $ext_path/_builds $ext_path/_builds/$ext_name
mkdir -p $ext_path/_builds $ext_path/_builds/$ext_name
cd "${ext_path}" || exit
rm -rf "${ext_path}"/_builds "${ext_path}"/_builds/"${ext_name}"
mkdir -p "${ext_path}"/_builds "${ext_path}"/_builds/"${ext_name}"

echo "Building directories..."
for directory in $(find ./ -type d | grep -vE ".git|.idea|custom|_build" | sed 's/.\///'); do
if [ ! -z "$directory" ]; then
mkdir -p $ext_path/_builds/$ext_name/$directory
fi
if [ -n "${directory}" ]; then
mkdir -p "${ext_path}"/_builds/"${ext_name}"/"${directory}"
fi
done

echo "Copying files..."
for file in $(find ./ -type f | grep -vE ".git|.idea|custom|.sh$|_build|LICENSE|.md$"); do
cp -r $file $ext_path/_builds/$ext_name/$file
cp -r "${file}" "${ext_path}"/_builds/$ext_name/"${file}"
done

perl -pi -e 's/VERSION/'$version'/g;s/DATE/'`date +%Y-%m-%d`'/g' $ext_path/_builds/$ext_name/templateDetails.xml
perl -pi -e 's/VERSION/'$version'/g;s/DATE/'`date +%Y-%m-%d`'/g' $ext_path/_builds/$ext_name/gantry/theme.yaml
perl -pi -e 's/VERSION/'$version'/g;s/DATE/'"$(date +%Y-%m-%d)"'/g' "${ext_path}"/_builds/$ext_name/templateDetails.xml
perl -pi -e 's/VERSION/'$version'/g;s/DATE/'"$(date +%Y-%m-%d)"'/g' "${ext_path}"/_builds/$ext_name/gantry/theme.yaml

echo "Building zip package..."
cd $ext_path/_builds
zip -rq $ext_path/_builds/$ext_name.zip $ext_name
rm -rf $ext_path/_builds/$ext_name
cd "${ext_path}"/_builds || exit
zip -rq "${ext_path}"/_builds/"${ext_name}".zip "${ext_name}"
rm -rf "${ext_path}"/_builds/"${ext_name}"

echo "Done!"
111 changes: 111 additions & 0 deletions js/audioplayer.init.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,111 @@
(function(){
jQuery(document).ready(function () {
AudioSetup = false,
AllAudioJS = null;
jQuery('[data-audioplayer-id]').each(function(index) {
var audiocontainer = jQuery(this),
AudioJS;

if (!AudioSetup) {
AllAudioJS = audiojs.createAll({ // Initialize Audio JS
trackEnded: function(e) {
var container = jQuery('#' + this.wrapper.id).closest('[data-audioplayer-id]');
next = jQuery('li.playing', container).next();
if (!next.length) next = jQuery('ol li', container).first();
next.click();
}
});
AudioSetup = true;
}

AudioJS = AllAudioJS[index];


// Load SoundCloud Data
var clientId = jQuery( this ).attr('data-audioplayer-clientid');
jQuery('[data-audioplayer-sctrack]').each(function(index) {
var trackId = jQuery(this).attr("data-audioplayer-sctrack");
var trackContainer = jQuery(this);

// DOM elements
var artwork = trackContainer;
var band = jQuery('.g-audioplayer-artist', trackContainer);
var song = jQuery('.g-audioplayer-title', trackContainer);

// Init SoundCloud JS SDK
SC.initialize({
client_id: clientId
});

// Getting SC track infos
SC.get('/tracks/'+trackId, function(track){
// Injecting infos
artwork.attr('data-cover', track.artwork_url.replace('-large', '-crop')); // Cover (replacing the default image size "large" with "crop")
band.html(track.user.username); // Band Name
song.html(track.title); // Song name
LoadFirst.call(audiocontainer, AudioJS);
});
});

// Load in a track on click
jQuery('ol li', audiocontainer).click(function(e) {
e.preventDefault();
jQuery(this).addClass('playing').siblings().removeClass('playing');
jQuery('.g-audioplayer-cover', audiocontainer).attr('alt', jQuery('a', this).text());
jQuery('.g-audioplayer-cover', audiocontainer).attr('src', jQuery('a', this).attr('data-cover'));
jQuery('.g-audioplayer-trackinfo', audiocontainer).html(jQuery('a', this).first().text());
AudioJS.load(jQuery('a', this).attr('data-src'));
AudioJS.play();
});

jQuery('.next', this).click(function(e) {
var next = jQuery('li.playing', audiocontainer).next();
if (!next.length) next = jQuery('ol li', audiocontainer).first();
next.click();
});
jQuery('.previous', this).click(function(e) {
var prev = jQuery('li.playing', audiocontainer).prev();
if (!prev.length) prev = jQuery('ol li', audiocontainer).last();
prev.click();
});

// Keyboard shortcuts
jQuery(document).keydown(function(e) {
var unicode = e.charCode ? e.charCode : e.keyCode;
// right arrow
if (unicode == 39) {
var next = jQuery('li.playing', audiocontainer).next();
if (!next.length) next = jQuery('ol li').first();
next.click();
// back arrow
} else if (unicode == 37) {
var prev = jQuery('li.playing', audiocontainer).prev();
if (!prev.length) prev = jQuery('ol li', audiocontainer).last();
prev.click();
// spacebar
} else if (unicode == 32) {
AudioJS.playPause();
}
});

LoadFirst.call(this, AudioJS);
});
});

var LoadFirst = function(audio) {
var first = jQuery('ol a', this).attr('data-src'),
firstcover = jQuery('ol a', this).attr('data-cover'),
firsttrackinfo = jQuery('ol a', this).html();

jQuery('ol li', this).first().addClass('playing');
audio.load(first);

jQuery('.g-audioplayer-cover', this).attr('src', firstcover);
jQuery('.g-audioplayer-cover', this).attr('alt', jQuery('ol a', this).first().text());
jQuery('.g-audioplayer-trackinfo', this).html(firsttrackinfo).text();
}
})();

jQuery( ".g-audioplayer-button" ).click(function( event ) {
event.stopPropagation();
});
Loading

0 comments on commit 4097625

Please sign in to comment.