Skip to content

Commit

Permalink
Remove notebooks and fix small styling issue
Browse files Browse the repository at this point in the history
  • Loading branch information
jparyani committed Aug 31, 2015
1 parent 142dbfc commit 9a18b3e
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 16 deletions.
14 changes: 0 additions & 14 deletions app/scripts/apps/navbar/show/template.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,20 +12,6 @@
<li><a href="#{{ uri }}notes/f/favorite"><i class="icon-favorite"></i> {{ i18n('Favourites') }}</a></li>
<li><a href="#{{ uri }}notes/f/open_tasks"><i class="icon-ok"></i> {{ i18n('Open tasks') }}</a></li>
<li><a href="#{{ uri }}notes/f/trashed"><i class="icon-trashed"></i> {{ i18n('Trash') }}</a></li>
<li><a href="#{{ uri }}notebooks"><i class="icon-notebook"></i> {{ i18n('Notebooks') }}</a></li>

<% if (notebooks !== null) { %>
<li class="divider"></li>
<% notebooks.forEach(function (model) { %>
<li><a href="#{{ uri }}notes/f/notebook/q/{{ model.id }}"><i class="icon-notebook"></i> {{ notebook(model) }}</a></li>
<% }); } %>

<li class="divider"></li>
<li<% if (profile === 'notes-db' || !profile) { %> class="active" <% } %>><a href="#/notes"><i class="icon-user"></i> Default</a></li>
<% _.forEach(settings.appProfiles, function (prof) { %>
<% if (prof !== 'notes-db') { %>
<li<% if (profile === prof) { %> class="active" <% } %>><a href="#{{ link(prof) }}"><i class="icon-user"></i> {{ prof }}</a></li>
<% } }); %>

<li class="divider"></li>
<li><a href="#{{ uri }}settings"><i class="icon-cog"></i> {{ i18n('Settings') }}</a></li>
Expand Down
4 changes: 2 additions & 2 deletions app/scripts/apps/notes/form/templates/form.html
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<li> {{ i18n('Characters:') }} <span id="charCount"></span> </li>
</ul>
</li>

</ul>
</nav>

Expand All @@ -36,7 +36,7 @@
<div class="form-group">
<input id="inputTitle" class="form-control" name="title" type="text" value="{{title}}" placeholder="{{ i18n('Title') }}" />
</div>
<div class="form-group border-0">
<div class="form-group border-0 notebook-selector">
<select class="form-control" name="notebookId">
<option value="0">{{ i18n('Select notebook') }}</option>
<option class="newNotebook">{{ i18n('New notebook') }}</option>
Expand Down
5 changes: 5 additions & 0 deletions app/styles/theme-default/pagedown.less
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,11 @@
.wmd-button-row {
margin-bottom: 0;
padding-left: 6px;
max-height: 42px !important;
}

.notebook-selector {
display: none;
}

.wmd-button:hover{
Expand Down

0 comments on commit 9a18b3e

Please sign in to comment.