Archives/Athou_commafeed
1
0
Fork 1
mirror of https://github.com/Athou/commafeed.git synced 2026-03-21 21:37:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

styling

Browse Source
This commit is contained in:
Athou
2013-04-06 19:04:51 +02:00
parent 92cba4e782
commit 9544b6194e
3 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/commafeed/frontend/pages/HomePage.java
View File

@@ -28,6 +28,8 @@ import com.commafeed.frontend.references.ngupload.NGUploadReference;
import com.commafeed.frontend.references.select2.Select2Reference; import com.commafeed.frontend.references.select2.Select2Reference;
import com.commafeed.frontend.references.spinjs.SpinJSReference; import com.commafeed.frontend.references.spinjs.SpinJSReference;
import de.agilecoders.wicket.markup.html.bootstrap.extensions.icon.OpenWebIconsCssReference;
@SuppressWarnings("serial") @SuppressWarnings("serial")
@SecurityCheck(Role.USER) @SecurityCheck(Role.USER)
public class HomePage extends BasePage { public class HomePage extends BasePage {
@@ -53,6 +55,8 @@ public class HomePage extends BasePage {
CodeMirrorCssReference.renderHead(response); CodeMirrorCssReference.renderHead(response);
CssTreeViewReference.renderHead(response); CssTreeViewReference.renderHead(response);
response.render(CssHeaderItem.forReference(OpenWebIconsCssReference
.instance()));
response.render(JavaScriptHeaderItem.forUrl("js/main.js")); response.render(JavaScriptHeaderItem.forUrl("js/main.js"));
response.render(JavaScriptHeaderItem.forUrl("js/controllers.js")); response.render(JavaScriptHeaderItem.forUrl("js/controllers.js"));

BIN
src/main/webapp/images/google_reader_icon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.0 KiB

18
src/main/webapp/templates/_subscribe.html
View File

@@ -1,15 +1,12 @@
<div ng-controller="SubscribeCtrl"> <div ng-controller="SubscribeCtrl">
<div class="btn-group"> <div class="btn-group">
<button class="btn" ng-click="open()">Subscribe</button> <button class="btn" ng-click="open()"><span class="icon-feed-simple"></span> Subscribe</button>
<button class="btn dropdown-toggle" data-toggle="dropdown"> <button class="btn dropdown-toggle" data-toggle="dropdown">
<span class="caret"></span> <span class="caret"></span>
</button> </button>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
<li> <li><a ng-click="openImport()"><i class="icon-arrow-down"></i> Import</a></li>
<a ng-click="open()">Subscribe</a> <li><a ng-click="openCategory()"><i class="icon-plus"></i> Add a category</a></li>
</li>
<li><a ng-click="openImport()">Import</a></li>
<li><a ng-click="openCategory()">New category</a></li>
</ul> </ul>
</div> </div>
<div modal="isOpen" close="close()" options="opts"> <div modal="isOpen" close="close()" options="opts">
@@ -57,8 +54,13 @@
<form ng-upload class="form-horizontal" action="rest/subscriptions/import"> <form ng-upload class="form-horizontal" action="rest/subscriptions/import">
<div class="modal-body"> <div class="modal-body">
<div class="control-group"> <div class="control-group">
<div>Download subscriptions.xml from <a target="_blank" href="https://www.google.com/reader/subscriptions/export">here</a>.</div> <div>Let me import your feeds from your
<div>Alternatively, let me import your feeds from your <a href="google/import/redirect">Google Reader account</a>.</div> <a href="google/import/redirect">
<img src="images/google_reader_icon.png" width="16px" height="16px"/>
Google Reader account
</a>.
</div>
<div>Alternatively, upload your subscriptions.xml file (download it from <a target="_blank" href="https://www.google.com/reader/subscriptions/export">here)</a>.</div>
</div> </div>
<div class="control-group"> <div class="control-group">
<label class="control-label">XML File</label> <label class="control-label">XML File</label>