diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..32ea0de0 --- /dev/null +++ b/.gitignore @@ -0,0 +1,23 @@ +*.py[cod] + +# C extensions +*.so + +# Packages +*.egg +*.egg-info +dist +build +eggs +parts +bin +var +sdist +develop-eggs +.installed.cfg +lib +lib64 + +# Installer logs +pip-log.txt +.DS_Store diff --git a/CHANGELOG.md b/CHANGELOG.md index 6675353f..b96c6de2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,10 @@ Changelog ========= +### 1.0.1 (March 12, 2013) + +* [Fixed] Requires parsedatetime 1.1.2 or newer + ### 1.0.0 (March 4, 2013) * [New] Integrates seamlessly with DayOne diff --git a/README.md b/README.md index 24bbf601..80486b9a 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ to make a new entry, just type and hit return. `yesterday:` will be interpreted as a timestamp. Everything until the first sentence mark (`.?!`) will be interpreted as the title, the rest as the body. In your journal file, the result will look like this: - 2012-03-29 09:00 Called in sick. + 2012-03-29 09:00 Called in sick. Used the time to clean the house and spent 4h on writing my book. If you just call `jrnl`, you will be prompted to compose your entry - but you can also configure _jrnl_ to use your external editor. @@ -44,15 +44,15 @@ The first time you run `jrnl` you will be asked where your journal file should b Usage ----- -_jrnl_ has to modes: __composing__ and __viewing__. +_jrnl_ has to modes: __composing__ and __viewing__. ### Viewing: - jrnl -n 10 + jrnl -n 10 will list you the ten latest entries, - jrnl -from "last year" -to march + jrnl -from "last year" -to march everything that happened from the start of last year to the start of last march. If you only want to see the titles of your entries, use @@ -62,7 +62,7 @@ everything that happened from the start of last year to the start of last march. Keep track of people, projects or locations, by tagging them with an `@` in your entries: - jrnl Had a wonderful day on the #beach with @Tom and @Anna. + jrnl Had a wonderful day on the @beach with @Tom and @Anna. You can filter your journal entries just like this: @@ -74,7 +74,14 @@ Will print all entries in which either `@pinkie` or `@WorldDomination` occurred. the last five entries containing both `@pineapple` __and__ `@lubricant`. You can change which symbols you'd like to use for tagging in the configuration. -> __Note:__ `jrnl @pinkie @WorldDomination` will switch to viewing mode because although now command line arguments are given, all the input strings look like tags - _jrnl_ will assume you want to filter by tag. +> __Note:__ `jrnl @pinkie @WorldDomination` will switch to viewing mode because although _no_ command line arguments are given, all the input strings look like tags - _jrnl_ will assume you want to filter by tag. + +### Composing: + +Composing mode is entered by either starting `jrnl` without any arguments -- which will prompt you to write an entry or launch your editor -- or by just writing an entry on the prompt, such as + + jrnl today at 3am: I just met Steve Buscemi in a bar! He looked funny. + ### Smart timestamps: @@ -111,6 +118,7 @@ Why not create a beautiful [timeline](http://timeline.verite.co/) of your journa jrnl --markdown + Markdown is a simple markup language that is human readable and can be used to be rendered to other formats (html, pdf). This README for example is formatted in markdown and github makes it look nice. Encryption @@ -143,25 +151,30 @@ The configuration file is a simple JSON file with the following options. - `tagsymbols`: Symbols to be interpreted as tags. (__See note below__) - `default_hour` and `default_minute`: if you supply a date, such as `last thursday`, but no specific time, the entry will be created at this time - `timeformat`: how to format the timestamps in your journal, see the [python docs](http://docs.python.org/library/time.html#time.strftime) for reference -- `highlight`: if `true` and you have [clint](http://www.nicosphere.net/clint-command-line-library-for-python/) installed, tags will be highlighted in cyan. +<<<<<<< HEAD +- `highlight`: if `true` and you have [clint](http://www.nicosphere.net/clint-command-line-library-for-python/) installed, tags will be highlighted in cyan. +======= +- `highlight`: if `true` and you have [clint](http://www.nicosphere.net/clint-command-line-library-for-python/) installed, tags will be highlighted in cyan. +>>>>>>> Typos and new style - `linewrap`: controls the width of the output. Set to `0` or `false` if you don't want to wrap long lines. > __Note on `tagsymbols`:__ Although it seems intuitive to use the `#` character for tags, there's a drawback: on most shells, this is interpreted as a meta-character starting a comment. This means that if you type -> +> > jrnl Implemented endless scrolling on the #frontend of our website. > > your bash will chop off everything after the `#` before passing it to _jrnl_). To avoid this, wrap your input into quotation marks like this: -> +> > jrnl "Implemented endless scrolling on the #frontend of our website." -> +> > Or use the built-in prompt or an external editor to compose your entries. ### DayOne Integration +<<<<<<< HEAD Using your DayOne journal instead of a flat text file is dead simple - instead of pointing to a text file, set the `"journal"` key in your `.jrnl_conf` to point to your DayOne journal. This is a folder ending with `.dayone`, and it's located at * `~/Library/Application Support/Day One/` by default - * `~/Dropbox/Apps/Day One/` if you're syncing with Dropbox and + * `~/Dropbox/Apps/Day One/` if you're syncing with Dropbox and * `~/Library/Mobile Documents/5U8NS4GX82~com~dayoneapp~dayone/Documents/` if you're syncing with iCloud. Instead of all entries being in a single file, each entry will live in a separate `plist` file. You can also star entries when you write them: @@ -177,14 +190,45 @@ You can configure _jrnl_ to use with multiple journals (eg. `private` and `work` "work": "~/work.txt" }, -The `default` journal gets created the first time you start _jrnl_. Now you can access the `work` journal by using `jrnl work` instead of `jrnl`, eg. +The `default` journal gets created the first time you start _jrnl_. Now you can access the `work` journal by using `jrnl work` instead of `jrnl`, eg. jrnl work at 10am: Meeting with @Steve jrnl work -n 3 - + will both use `~/work.txt`, while `jrnl -n 3` will display the last three entries from `~/journal.txt` (and so does `jrnl default -n 3`). You can also override the default options for each individual journal. If you `.jrnl_conf` looks like this: +======= + +Using your DayOne journal instead of a flat text file is dead simple - instead of pointing to a text file, set the `"journal"` key in your `.jrnl_conf` to point to your DayOne journal. This is a folder ending with `.dayone`, and it's located at + + * `~/Library/Application Support/Day One/` by default + * `~/Dropbox/Apps/Day One/` if you're syncing with Dropbox and + * `~/Library/Mobile Documents/5U8NS4GX82~com~dayoneapp~dayone/Documents/` if you're syncing with iCloud. + +Instead of all entries being in a single file, each entry will live in a separate `plist` file. You can also star entries when you write them: + + jrnl -star yesterday: Lunch with @Arthur + +### Multiple journal files + +You can configure _jrnl_ to use with multiple journals (eg. `private` and `work`) by defining more journals in your `.jrnl_config`, for example: + + "journals": { + "default": "~/journal.txt", + "work": "~/work.txt" + }, + +The `default` journal gets created the first time you start _jrnl_. Now you can access the `work` journal by using `jrnl work` instead of `jrnl`, eg. + + jrnl work at 10am: Meeting with @Steve + jrnl work -n 3 + +will both use `~/work.txt`, while `jrnl -n 3` will display the last three entries from `~/journal.txt` (and so does `jrnl default -n 3`). + +You can also override the default options for each individual journal. If you `.jrnl_conf` looks like this: + +>>>>>>> Typos and new style { ... "encrypt": false diff --git a/css/jrnl.css b/css/jrnl.css index 72abf915..59d175d5 100644 --- a/css/jrnl.css +++ b/css/jrnl.css @@ -145,9 +145,19 @@ blockquote p{ font-size: 11pt; } -.logo .span10 { +.logo .span12 { text-align: center; height: 180px; + padding-bottom: 180px; + background: url(../img/header.png) center bottom no-repeat; +} + +@media screen and (max-width: 550px) { + .logo .span12 { + background-size: 100%; + padding-bottom: 30%; + } + } .logo .span2 { diff --git a/img/header.png b/img/header.png new file mode 100644 index 00000000..3c4fad0b Binary files /dev/null and b/img/header.png differ diff --git a/img/header.svg b/img/header.svg new file mode 100644 index 00000000..ec66e4af --- /dev/null +++ b/img/header.svg @@ -0,0 +1,2746 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + $ jrnl today: Started writing my Memoirs. On the command line. Like a boss. + + Terminal + Terminal + + + + + + + + + + + + + + + + + + + + + diff --git a/img/logo-top.png b/img/logo-top.png index 5fa15720..f050855d 100644 Binary files a/img/logo-top.png and b/img/logo-top.png differ diff --git a/index.html b/index.html index 5b753abf..0b2b3409 100644 --- a/index.html +++ b/index.html @@ -43,10 +43,10 @@ Fork me on GitHub -
+ +
@@ -54,7 +54,7 @@   @@ -81,7 +81,7 @@

and hit return. yesterday: will be interpreted as a timestamp. Everything until the first sentence mark (.?!) will be interpreted as the title, the rest as the body. In your journal file, the result will look like this:

-
2012-03-29 09:00 Called in sick. 
+
2012-03-29 09:00 Called in sick.
 Used the time to clean the house and spent 4h on writing my book.
 

 
@@ -105,7 +105,7 @@ python setup.py install
 
 
Usage

 
-
jrnl has to modes: composing and viewing. 

+
jrnl has to modes: composing and viewing.

 
 
Viewing:

 
@@ -126,7 +126,7 @@ python setup.py install
 
 
Keep track of people, projects or locations, by tagging them with an @ in your entries:

 
-
jrnl Had a wonderful day on the #beach with @Tom and @Anna.
+
jrnl Had a wonderful day on the @beach with @Tom and @Anna.
 

 
 
You can filter your journal entries just like this:

@@ -142,9 +142,16 @@ python setup.py install
 
the last five entries containing both @pineapple and @lubricant. You can change which symbols you'd like to use for tagging in the configuration.

 
 

-  
Note: jrnl @pinkie @WorldDomination will switch to viewing mode because although now command line arguments are given, all the input strings look like tags - jrnl will assume you want to filter by tag. 

+  
Note: jrnl @pinkie @WorldDomination will switch to viewing mode because although no command line arguments are given, all the input strings look like tags - jrnl will assume you want to filter by tag.

 

 
+
Composing:

+
+
Composing mode is entered by either starting jrnl without any arguments -- which will prompt you to write an entry or launch your editor -- or by just writing an entry on the prompt, such as

+
+
jrnl today at 3am: I just met Steve Buscemi in a bar! He looked funny.
+

+
 
Smart timestamps:

 
 
Timestamps that work:

@@ -216,7 +223,7 @@ python setup.py install
 
  • tagsymbols: Symbols to be interpreted as tags. (See note below)
    • 
 
  • default_hour and default_minute: if you supply a date, such as last thursday, but no specific time, the entry will be created at this time
    • 
 
  • timeformat: how to format the timestamps in your journal, see the python docs for reference
    • 
-
  • highlight: if true and you have clint installed, tags will be highlighted in cyan. 
    • 
+
  • highlight: if true and you have clint installed, tags will be highlighted in cyan.
    • 
 
  • linewrap: controls the width of the output. Set to 0 or false if you don't want to wrap long lines.
    • 
 
 
@@ -225,12 +232,12 @@ python setup.py install
 
 
    jrnl Implemented endless scrolling on the #frontend of our website.
 
    
-  
+
   
    your bash will chop off everything after the # before passing it to jrnl). To avoid this, wrap your input into quotation marks like this:
    
 
 
    jrnl "Implemented endless scrolling on the #frontend of our website."
 
    
-  
+
   
    Or use the built-in prompt or an external editor to compose your entries.
    
 
 
@@ -239,7 +246,7 @@ python setup.py install
 
    Using your DayOne journal instead of a flat text file is dead simple - instead of pointing to a text file, set the "journal" key in your .jrnl_conf to point to your DayOne journal. This is a folder ending with .dayone, and it's located at
    
 
 
    * `~/Library/Application Support/Day One/` by default
-* `~/Dropbox/Apps/Day One/` if you're syncing with Dropbox and 
+* `~/Dropbox/Apps/Day One/` if you're syncing with Dropbox and
 * `~/Library/Mobile Documents/5U8NS4GX82~com~dayoneapp~dayone/Documents/` if you're syncing with iCloud.
 
    
 
@@ -258,7 +265,7 @@ python setup.py install
 },
 
    
 
-
    The default journal gets created the first time you start jrnl. Now you can access the work journal by using jrnl work instead of jrnl, eg. 
    
+
    The default journal gets created the first time you start jrnl. Now you can access the work journal by using jrnl work instead of jrnl, eg.
    
 
 
    jrnl work at 10am: Meeting with @Steve
 jrnl work -n 3
@@ -266,18 +273,20 @@ jrnl work -n 3
 
 
    will both use ~/work.txt, while jrnl -n 3 will display the last three entries from ~/journal.txt (and so does jrnl default -n 3).
    
 
-
    You can also override the default options for each individual journal. If you .jrnl_conf looks like this:
-    {
-      ...
-      "encrypt": false
-      "journals": {
-        "default": "~/journal.txt",
-        "work": {
-          "journal": "~/work.txt",
-          "encrypt": true
-        },
-        "food": "~/my_recipes.txt",
-    }
    
+
    You can also override the default options for each individual journal. If you .jrnl_conf looks like this:
    
+
+
    {
+  ...
+  "encrypt": false
+  "journals": {
+    "default": "~/journal.txt",
+    "work": {
+      "journal": "~/work.txt",
+      "encrypt": true
+    },
+    "food": "~/my_recipes.txt",
+}
+
    
 
 
    Your default and your food journals won't be encrypted, however your work journal will! You can override all options that are present at the top level of .jrnl_conf, just make sure that at the very least you specify a "journal": ... key that points to the journal file of that journal.
    
 
@@ -301,6 +310,12 @@ with open("my_journal.txt") as f:
 
 
    Changelog
    
 
+
    1.0.1 (March 12, 2013)
    
+
+
      
+
    • Fixed Requires parsedatetime 1.1.2 or newer
      • 
+
    
+
 
    1.0.0 (March 4, 2013)
    diff --git a/templates/header.html b/templates/header.html index 633b99fd..12aec71e 100644 --- a/templates/header.html +++ b/templates/header.html @@ -43,10 +43,9 @@ Fork me on GitHub -
    +
    @@ -54,10 +53,10 @@  
    - +