forked from Archives/Athou_commafeed
styling
This commit is contained in:
@@ -28,6 +28,8 @@ import com.commafeed.frontend.references.ngupload.NGUploadReference;
|
||||
import com.commafeed.frontend.references.select2.Select2Reference;
|
||||
import com.commafeed.frontend.references.spinjs.SpinJSReference;
|
||||
|
||||
import de.agilecoders.wicket.markup.html.bootstrap.extensions.icon.OpenWebIconsCssReference;
|
||||
|
||||
@SuppressWarnings("serial")
|
||||
@SecurityCheck(Role.USER)
|
||||
public class HomePage extends BasePage {
|
||||
@@ -53,6 +55,8 @@ public class HomePage extends BasePage {
|
||||
CodeMirrorCssReference.renderHead(response);
|
||||
|
||||
CssTreeViewReference.renderHead(response);
|
||||
response.render(CssHeaderItem.forReference(OpenWebIconsCssReference
|
||||
.instance()));
|
||||
|
||||
response.render(JavaScriptHeaderItem.forUrl("js/main.js"));
|
||||
response.render(JavaScriptHeaderItem.forUrl("js/controllers.js"));
|
||||
|
||||
BIN
src/main/webapp/images/google_reader_icon.png
Normal file
BIN
src/main/webapp/images/google_reader_icon.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 3.0 KiB |
@@ -1,15 +1,12 @@
|
||||
<div ng-controller="SubscribeCtrl">
|
||||
<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">
|
||||
<span class="caret"></span>
|
||||
</button>
|
||||
<ul class="dropdown-menu">
|
||||
<li>
|
||||
<a ng-click="open()">Subscribe</a>
|
||||
</li>
|
||||
<li><a ng-click="openImport()">Import</a></li>
|
||||
<li><a ng-click="openCategory()">New category</a></li>
|
||||
<li><a ng-click="openImport()"><i class="icon-arrow-down"></i> Import</a></li>
|
||||
<li><a ng-click="openCategory()"><i class="icon-plus"></i> Add a category</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
<div modal="isOpen" close="close()" options="opts">
|
||||
@@ -57,8 +54,13 @@
|
||||
<form ng-upload class="form-horizontal" action="rest/subscriptions/import">
|
||||
<div class="modal-body">
|
||||
<div class="control-group">
|
||||
<div>Download subscriptions.xml from <a target="_blank" href="https://www.google.com/reader/subscriptions/export">here</a>.</div>
|
||||
<div>Alternatively, let me import your feeds from your <a href="google/import/redirect">Google Reader account</a>.</div>
|
||||
<div>Let me import your feeds from your
|
||||
<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 class="control-group">
|
||||
<label class="control-label">XML File</label>
|
||||
|
||||
Reference in New Issue
Block a user