diff --git a/couscous.yml b/couscous.yml index 59975e9..bdba797 100644 --- a/couscous.yml +++ b/couscous.yml @@ -1,9 +1,13 @@ template: directory: website +exclude: + - src + - rel + #Variables title: Modation -version: "2.1" +version: "2.1.1" tagline: Soundation, amplified. author: cyberbit authorLink: https://github.com/cyberbit diff --git a/docs/README.md b/docs/README.md new file mode 100644 index 0000000..3dd0955 --- /dev/null +++ b/docs/README.md @@ -0,0 +1,24 @@ +--- +layout: docs +page: Documentation +--- + +## Release Process +1. Check issues on milestone and ensure they are closed, along with the milestone itself. +2. Draft GitHub release with included changes, under the headers **Spotlight**, **New features**, and **Changes**. + > For ordering issue numbers, use the **right-weighted** style: + > - \#33, **#43**: Restructured scripts. + - \#6, #15, **#45**: Cancelled development on features already built into the new Community structure. + - **#52**: Pulled support for multiple accounts. + - \#35, **#56**: New project page! http://cyberbit.github.io/modation + > + > If commit hashes are referenced, list those last: + > - \#26, `5b210ab`: Added Soundcloud-style tool tip to user and group links. +3. Start new `release/x.y(.z)` branch using Git Flow. +4. Update manifest. Increment version to `x.y` for feature releases, `x.y.z` for fixbag releases. +5. Compile scripts using Closure. Switch references in manifest and content pages to minified files. +6. Copy `src` to `rel`. Remove files not applicable to release (i.e., non-minified JS). Commit to release branch. +7. Load `rel` into development Chrome. If problems are found, fix in `develop` and go back to compile step (5). +8. Increment version in `couscous.yml`. Copy GitHub release HTML to `whats-new.twig`, using the headers **What's New**, **What's Changed**, and **What's Fixed**. Commit to release branch. Finish release using Git Flow. +9. Pack and zip project as `project-x.y.z.*`. Add archives to GitHub release, double-check information, and publish release. Tag release merge on `master` with `vx.y.z`. +10. Upload `.zip` to webstore. Update description and screenshots as needed. Publish to webstore. \ No newline at end of file diff --git a/rel/background.html b/rel/background.html index 78406bc..6ce2604 100644 --- a/rel/background.html +++ b/rel/background.html @@ -7,6 +7,11 @@ + + + + + diff --git a/rel/js/content.min.js b/rel/js/content.min.js index d47431c..dd5dd09 100644 --- a/rel/js/content.min.js +++ b/rel/js/content.min.js @@ -1,6 +1,6 @@ var storage={};var me={};preinit();$(function(){});function preinit(){$.get(chrome.extension.getURL("content.html"),function(d){$("body").append(d);crapi.clone(function(d){storage=d;modapi.login(function(mi){me=mi;init();initTags();initComments();initTracks();initGroups()})})})}function init(){} function initTags(){var $newComment=$(".new_comment #comment_content");if($newComment.length){var $comments=$(".main div.comments");var names=$comments.find(".comment .content > h4").map(function(){return $(this).text()}).get().unique();var namesParsed=[];$.each(names,function(i,v){namesParsed.push({val:v})});$newComment.sew({values:namesParsed})}} -function initComments(){var $writeComment=$(".write-comment");if($writeComment.length){var $header=$writeComment.siblings("h3");var $comments=$writeComment.siblings("div.comments");$writeComment.addClass("mod-write-comment");$comments.addClass("mod-comments");$header.after($writeComment)}} +function initComments(){var $writeComment=$(".write-comment");if($writeComment.length){var $header=$writeComment.prevAll("h3").first();var $comments=$writeComment.siblings("div.comments");$writeComment.addClass("mod-write-comment");$comments.addClass("mod-comments");$header.after($writeComment)}} function initTracks(){var $myTracks=$(".feed-item.track").has(".info a[href='"+me.link+"']");if($myTracks.length)$myTracks.each(function(i,e){var $track=$(this);var shortlink=$track.find(".share-sheet input").val();console.log("shortlink: %o",shortlink)})} -function initGroups(){var $groupList=$(".group-list");var $groupFilter=_factory(".modation-factory",".modation-group-filter");var $filter=$groupFilter.find(".filter");$groupList.addClass("mod-group-list");$groupList.before($groupFilter);$groupList.isotope({itemSelector:".group",layoutMode:"vertical",transitionDuration:".3s"});$groupList.imagesLoaded().progress(function(){$groupList.isotope("layout")});handle($filter,"input.initGroups",function(e){var $this=$(this);var val=$this.val();var search=val.toLowerCase(); -$groupList.isotope({filter:function(){var $this=$(this);var $name=$this.find(".name");var text=$name.text().toLowerCase();return text.indexOf(search)!=-1}})})}; +function initGroups(){var $groupList=$(".main .group-list");var $groupFilter=_factory(".modation-factory",".modation-group-filter");var $filter=$groupFilter.find(".filter");$groupList.addClass("mod-group-list");$groupList.before($groupFilter);$groupList.isotope({itemSelector:".group",layoutMode:"vertical",transitionDuration:".3s"});$groupList.imagesLoaded().progress(function(){$groupList.isotope("layout")});handle($filter,"input.initGroups",function(e){var $this=$(this);var val=$this.val();var search= +val.toLowerCase();$groupList.isotope({filter:function(){var $this=$(this);var $name=$this.find(".name");var text=$name.text().toLowerCase();return text.indexOf(search)!=-1}})})}; diff --git a/rel/manifest.json b/rel/manifest.json index 8d1d4b0..67b51b9 100644 --- a/rel/manifest.json +++ b/rel/manifest.json @@ -1,7 +1,7 @@ { "manifest_version": 2, "name": "Modation", - "version": "2.1", + "version": "2.1.1", "description": "Soundation, amplified.", "icons": { "16": "img/newicon16.png", diff --git a/src/js/content.js b/src/js/content.js index a9be973..2a5392e 100644 --- a/src/js/content.js +++ b/src/js/content.js @@ -277,7 +277,7 @@ function initComments() { //Comment box exists if ($writeComment.length) { - var $header = $writeComment.siblings("h3"); + var $header = $writeComment.prevAll("h3").first(); var $comments = $writeComment.siblings("div.comments"); //Set up comments @@ -308,7 +308,7 @@ function initTracks() { //Initialize group list function initGroups() { - var $groupList = $(".group-list"); + var $groupList = $(".main .group-list"); var $groupFilter = _factory(".modation-factory", ".modation-group-filter"); var $filter = $groupFilter.find(".filter"); diff --git a/src/js/content.min.js b/src/js/content.min.js new file mode 100644 index 0000000..dd5dd09 --- /dev/null +++ b/src/js/content.min.js @@ -0,0 +1,6 @@ +var storage={};var me={};preinit();$(function(){});function preinit(){$.get(chrome.extension.getURL("content.html"),function(d){$("body").append(d);crapi.clone(function(d){storage=d;modapi.login(function(mi){me=mi;init();initTags();initComments();initTracks();initGroups()})})})}function init(){} +function initTags(){var $newComment=$(".new_comment #comment_content");if($newComment.length){var $comments=$(".main div.comments");var names=$comments.find(".comment .content > h4").map(function(){return $(this).text()}).get().unique();var namesParsed=[];$.each(names,function(i,v){namesParsed.push({val:v})});$newComment.sew({values:namesParsed})}} +function initComments(){var $writeComment=$(".write-comment");if($writeComment.length){var $header=$writeComment.prevAll("h3").first();var $comments=$writeComment.siblings("div.comments");$writeComment.addClass("mod-write-comment");$comments.addClass("mod-comments");$header.after($writeComment)}} +function initTracks(){var $myTracks=$(".feed-item.track").has(".info a[href='"+me.link+"']");if($myTracks.length)$myTracks.each(function(i,e){var $track=$(this);var shortlink=$track.find(".share-sheet input").val();console.log("shortlink: %o",shortlink)})} +function initGroups(){var $groupList=$(".main .group-list");var $groupFilter=_factory(".modation-factory",".modation-group-filter");var $filter=$groupFilter.find(".filter");$groupList.addClass("mod-group-list");$groupList.before($groupFilter);$groupList.isotope({itemSelector:".group",layoutMode:"vertical",transitionDuration:".3s"});$groupList.imagesLoaded().progress(function(){$groupList.isotope("layout")});handle($filter,"input.initGroups",function(e){var $this=$(this);var val=$this.val();var search= +val.toLowerCase();$groupList.isotope({filter:function(){var $this=$(this);var $name=$this.find(".name");var text=$name.text().toLowerCase();return text.indexOf(search)!=-1}})})}; diff --git a/src/manifest.json b/src/manifest.json index 9bd98c6..e821906 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -1,7 +1,7 @@ { "manifest_version": 2, "name": "Modation", - "version": "2.1", + "version": "2.1.1", "description": "Soundation, amplified.", "icons": { "16": "img/newicon16.png", diff --git a/website/default.twig b/website/default.twig index 3865a77..daa3ff4 100644 --- a/website/default.twig +++ b/website/default.twig @@ -2,8 +2,12 @@ - {{ title }} by {{ author }} + + + {{ (page) ? page ~ " - " }}{{ title }} by {{ author }} + + @@ -15,7 +19,18 @@ {% block content %} - {{ content|raw }} +
+
+ {{ content|raw }} +
+
{% endblock %} +
+
+ +
+
\ No newline at end of file diff --git a/website/docs.twig b/website/docs.twig new file mode 100644 index 0000000..a52bb1e --- /dev/null +++ b/website/docs.twig @@ -0,0 +1,15 @@ +{% extends "default.twig" %} + +{% block content %} +
+

+ + {{ title }} Docs v{{ version }} +

+
+
+
+ {{ content|raw }} +
+
+{% endblock %} \ No newline at end of file diff --git a/website/home.twig b/website/home.twig index 075e8a8..5ca6106 100644 --- a/website/home.twig +++ b/website/home.twig @@ -23,11 +23,4 @@ {{ content|raw }} -
-
- -
-
{% endblock %} \ No newline at end of file diff --git a/website/img/newiconflat192.png b/website/img/newiconflat192.png new file mode 100644 index 0000000..e454188 Binary files /dev/null and b/website/img/newiconflat192.png differ diff --git a/website/stylesheets/stylesheet.custom.css b/website/stylesheets/stylesheet.custom.css index 6494f09..3bf029c 100644 --- a/website/stylesheets/stylesheet.custom.css +++ b/website/stylesheets/stylesheet.custom.css @@ -349,6 +349,16 @@ a:hover { max-width: 400px } +.page-header.docs { + padding: 1em; +} + +.page-header.docs .img-responsive { + height: 2em; + width: 2em; + vertical-align: middle; +} + h1 { font-family: "Roboto Slab"; font-weight: 500 diff --git a/website/whats-new.twig b/website/whats-new.twig index 59c3efb..8f06c01 100644 --- a/website/whats-new.twig +++ b/website/whats-new.twig @@ -3,4 +3,9 @@
  • #44: Added user tagging in comments (via @).
  • #59: Added quick filter to group lists.
  • #67: Moved comments box above thread on tracks and groups.
    • + +

    What's Fixed

    + \ No newline at end of file