Merge pull request #3 from benaryorg/testing

Testing
This commit is contained in:
overflowerror 2014-06-10 16:32:10 +02:00
commit 0d9ee03b7e
5 changed files with 19 additions and 16 deletions

View file

@ -6,7 +6,8 @@ It is a web-application, to store your personal diary in an easy way!
## Development
I currently do not have much time to develop this program, but I would like to use it by myself, so I will put most of my time in it.
I currently do not have much time to develop this program, but I would
like to use it by myself, so I will put most of my time in it.
Please report bugs or tell me what features you would like to see soon.
@ -21,7 +22,10 @@ The stable version, where **all** bugfixes directly go to.
### testing
The branch I will use for developing (because I have more than just one computer).
The branch used for development. It will be mostly stable, but there will be
some things like a logout button on the login page.
You should use this one, if you want functionality! Use it with `git checkout testing`!
## Concept
@ -39,7 +43,7 @@ The table `entries` stores your diary entries.
## Technical Details
Diary is written in _python2.7_ and is using _flask_ and _sqlalchemy_!
Diary is written in _python2.7_ and is using _flask_, _bcrypt_ and _sqlalchemy_!
# Contribution

View file

@ -85,6 +85,10 @@ a, a:active, a:visited {
padding: 0px 0px 0px 0px;
}
#listing p {
white-space:pre-wrap;
}
.error {
padding: 5px;
color: red;

View file

@ -10,7 +10,7 @@
<div class="dot centered">
<div id="mainContainer">
<div id="header">
<h1>Diary {{ diary.name }}</h1>
<h1><a href="//github.com/benaryorg/Diary">Diary {{ diary.name }}</a></h1>
<div id="logout">
<a href="{{ url_for('logout') }}">Logout</a><br />
<a href="{{ url_for('index') }}">Diary-List</a>
@ -19,16 +19,14 @@
<div id="contentContainer">
<form action="{{ url_for('addentry',name=diary.name) }}" method="POST">
Add new entry:<br />
<textarea name="text"></textarea><br />
<textarea name="text" style="width:99%;height:150px;" required autofocus></textarea><br/>
<input type="submit">
</form>
<div id="listing">
{% for e in entries %}
<div>
<div>{{ e.date }}</div>
<p>
{{ e.text }}
</p>
<p>{{ e.text }}</p>
</div>
{% endfor %}
</div>

View file

@ -10,7 +10,7 @@
<div class="dot centered">
<div id="mainContainer">
<div id="header">
<h1>Diarys</h1>
<h1><a href="//github.com/benaryorg/Diary">Diary</a></h1>
<div id="logout">
<a href="{{ url_for('logout') }}">Logout</a>
</div>
@ -29,7 +29,7 @@
{% endfor %}
</div>
<form method="post" action="{{ url_for('newdiary')}}">
You can add a new diary, if you want: <input type="text" name="name" placeholder="name of diary"><input type="submit">
You can add a new diary, if you want: <input type="text" name="name" placeholder="name of diary" required><input type="submit">
</form>
</div>
<div>

View file

@ -10,15 +10,12 @@
<div class="dot centered">
<div id="mainContainer">
<div id="header">
<h1>Diary</h1>
<div id="logout">
<a href="{{ url_for('logout') }}">Logout</a>
</div>
<h1><a href="//github.com/benaryorg/Diary">Diary</a></h1>
</div>
<div id="contentContainer">
<form method="POST">
<input type="text" name="user" placeholder="Username"/><br/>
<input type="password" name="pass" placeholder="Password"/><br/>
<input type="text" name="user" placeholder="Username" required autofocus/><br/>
<input type="password" name="pass" placeholder="Password" required/><br/>
<input type="submit" value="Login">
</form>
</div>