Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Various fixes for New notebook button #115

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Various fixes for New notebook button #115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5b39418
Fix for New notebook closing sidebar and new notebook cancel button
atbanpc Jul 9, 2018
1b409a0
Add forgotten translation
atbanpc Jul 9, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions controller/translationcontroller.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ public function getLanguageStrings() {
$translations = array(
//'create.notebook' => $this->trans->t('Generating sharing keys ( %s / 2)','%step'),
'new.notebook' => $this->trans->t('New notebook'),
'enter.notebook.name' => $this->trans->t('Enter notebook name'),
'not.grouped' => $this->trans->t('Not in notebook'),
'notebook.name' => $this->trans->t('Notebook name'),
'deleted.notes' => $this->trans->t('Deleted notes'),
Expand Down
2 changes: 1 addition & 1 deletion css/app.css
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion sass/app.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,7 @@
.add_group_container{
padding: 0 5px 0 5px;
input#new_group_name{
width: 150px;
width: 149px;
}
}
.add-note {
Expand Down
4 changes: 2 additions & 2 deletions templates/main.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,9 @@
<div id="app-navigation" ng-show="sidebar_shown">
<ul id="grouplist">
<li class="group" ng-init="add_group = false;">
<a class="name" role="button" title="All" ng-click="add_group = true;" ng-hide="add_group">+ {{ 'new.notebook' | translate }}</a>
<a class="name app-navigation-noclose" role="button" title="All" ng-click="add_group = true;" ng-hide="add_group">+ {{ 'new.notebook' | translate }}</a>
<div ng-show="add_group" class="add_group_container">
<input type="text" ng-model="new_group_name" id="new_group_name" placeholder="Enter notebook name">
<input type="text" ng-model="new_group_name" id="new_group_name" placeholder="{{ 'enter.notebook.name' | translate | capitalize }}">
<div class="button" ng-click="addNotebook(new_group_name); add_group = false;"><i class="fa fa-check"></i> </div>
<div class="button" ng-click="add_group = false; new_group_name = '';"><i class="fa fa-times"></i> </div>
</div>
Expand Down