Skip to content

Commit

Permalink
Move about page to own modal, bump version
Browse files Browse the repository at this point in the history
  • Loading branch information
@Terrance
Terrance committed Dec 30, 2015
1 parent 254a73a commit 72047c9
Show file tree
Hide file tree
Showing 5 changed files with 48 additions and 12 deletions.
2 changes: 1 addition & 1 deletion Homely/manifest.json
View file
Expand Up @@ -2,7 +2,7 @@
"name": "Homely",
"short_name": "Homely",
"description": "A custom New Tab page, providing a quick, customizable layout of links and menus, as well as simple bookmark and history components.",
"version": "1.6",
"version": "1.7",
"author": "Ollie Terrance",
"homepage_url": "https://github.com/OllieTerrance/Homely",
"incognito": "split",
Expand Down
7 changes: 7 additions & 0 deletions Homely/res/css/homely.css
View file
Expand Up @@ -211,3 +211,10 @@ input[type=range] {
margin-top: 20px;
margin-bottom: 10px;
}
#about h2 {
margin-top: 0;
}
#about .btn-group {
margin-top: 8px;
margin-bottom: 16px;
}
34 changes: 24 additions & 10 deletions Homely/res/html/homely.html
View file
Expand Up @@ -49,6 +49,8 @@
<li class="divider"></li>
<li><a id="settings-import"><i class="fa fa-fw fa-arrow-left"></i> Import from file</a></li>
<li><a id="settings-export" download="homely.json"><i class="fa fa-fw fa-arrow-right"></i> Export to file</a></li>
<li class="divider"></li>
<li><a id="about-toggle" data-toggle="modal" data-target="#about"><i class="fa fa-fw fa-home"></i> About <span class="ext-name"></span></a></li>
</ul>
<input id="settings-import-file" type="file">
</li>
Expand Down Expand Up @@ -106,7 +108,6 @@ <h4 class="modal-title"><i class="fa fa-cog"></i>&nbsp; Settings</h4>
<li><a data-toggle="tab" data-target="#settings-tab-baskets"><i class="fa fa-shopping-basket"></i> <span class="hidden-sm">Baskets</span></a></li>
<li><a data-toggle="tab" data-target="#settings-tab-general"><i class="fa fa-star"></i> <span class="hidden-sm">General</span></a></li>
<li><a data-toggle="tab" data-target="#settings-tab-style"><i class="fa fa-eye"></i> <span class="hidden-sm">Style</span></a></li>
<li><a data-toggle="tab" data-target="#settings-tab-about"><i class="fa fa-home"></i> <span class="hidden-sm">About</span></a></li>
</ul>
<div class="tab-content">
<div class="tab-pane active form-horizontal" id="settings-tab-links">
Expand Down Expand Up @@ -574,15 +575,6 @@ <h4 class="modal-title"><i class="fa fa-cog"></i>&nbsp; Settings</h4>
</div>
</div>
</div>
<div class="tab-pane" id="settings-tab-about">
<img src="../img/logo-128.png"/>
<h2 id="settings-about-title"></h2>
<p>Written by <a class="link-external" href="http://terrance.allofti.me">Ollie Terrance</a></p>
<p>
<a class="btn btn-sm btn-default link-external" href="https://github.com/OllieTerrance/Homely"><i class="fa fa-github-alt"></i>&nbsp; View on GitHub</a>
<a class="btn btn-sm btn-default link-external" href="https://chrome.google.com/webstore/detail/homely/fplghnonomhbnlhdnmjpipoomkjdpeim"><i class="fa fa-shopping-cart"></i>&nbsp; View on Web Store</a>
</p>
</div>
</div>
</div>
<div class="modal-footer">
Expand Down Expand Up @@ -661,6 +653,28 @@ <h4>Misc</h4>
</div>
</div>
</div>
<div id="about" class="modal fade">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button class="close" data-dismiss="modal" aria-hidden="true"><i class="fa fa-times"></i></button>
<h4 class="modal-title"><i class="fa fa-home"></i>&nbsp; About</h4>
</div>
<div class="modal-body text-center">
<img src="../img/logo-128.png"/>
<h2><span class="ext-name"></span> <small class="ext-ver"></small></h2>
<p>Written by <a class="link-external" href="http://terrance.allofti.me">Ollie Terrance</a></p>
<div class="btn-group">
<a class="btn btn-sm btn-default link-external" href="https://github.com/OllieTerrance/Homely"><i class="fa fa-github-alt"></i>&nbsp; GitHub project</a>
<a class="btn btn-sm btn-default link-external" href="https://github.com/OllieTerrance/Homely/releases"><i class="fa fa-download"></i>&nbsp; Changelog</a>
<a class="btn btn-sm btn-default link-external" href="https://chrome.google.com/webstore/detail/homely/fplghnonomhbnlhdnmjpipoomkjdpeim"><i class="fa fa-chrome"></i>&nbsp; Web Store page</a>
</div>
<p>Feedback is welcome &ndash; see the <a class="link-external" href="https://chrome.google.com/webstore/detail/homely/fplghnonomhbnlhdnmjpipoomkjdpeim/reviews">Reviews</a> section on the Chrome Web Store page.</p>
<p>For bug reports and feature requests (including new inclusions for notifications and baskets), please add to the <a class="link-external" href="https://github.com/OllieTerrance/Homely/issues">issue tracker</a> on GitHub.</p>
</div>
</div>
</div>
</div>
<script src="../../lib/js/jquery.min.js"></script>
<script src="../../lib/js/jquery.sortable.min.js"></script>
<script src="../../lib/js/bootstrap.min.js"></script>
Expand Down
3 changes: 2 additions & 1 deletion Homely/res/js/homely.js
View file
Expand Up @@ -2040,7 +2040,8 @@ $(document).ready(function() {
}
$("#settings-style-font").val(settings.style["font"]);
});
$("#settings-about-title").html(manif.name + " <small>" + manif.version + "</small>");
$(".ext-name").text(manif.name);
$(".ext-ver").text(manif.version);
// reset modal on show
$("#settings").on("show.bs.modal", function(e) {
$("#settings-alerts").empty();
Expand Down
14 changes: 14 additions & 0 deletions README.md
View file
Expand Up @@ -10,6 +10,20 @@ Homely is a custom New Tab page replacement for Google Chrome. It aims to provi
* [HTML5 Sortable](http://farhadi.ir/projects/html5sortable/)
* [Mousetrap](http://craig.is/killing/mice)

The minimum set of files should be laid out inside the Homely folder as follows:

* lib
* css
* bootstrap.min.css
* font-awesome.min.css
* fonts
* fontawesome-webfont.woff2
* js
* bootstrap.min.js
* jquery.min.js
* jquery.sortable.js
* mousetrap.min.js

## Keyboard shortcuts

If enabled, the page can be navigated by keyboard. Note that Chrome will, by default, give focus to the onmibox when opening a new tab, so you must first `Tab` into the page.
Expand Down

0 comments on commit 72047c9

Please sign in to comment.