Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2026-02-16 20:28:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of git@github.com:bsag/tracks

Browse source
This commit is contained in:
Reinier Balt 2008-08-25 16:45:57 +02:00
commit 4e12cfafb2
4 changed files with 13 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/views/integrations/rest_api.html.erb
View file

@ -73,7 +73,7 @@
<pre> <pre>
<code> <code>
$ curl -u username:p4ssw0rd -H "Content-Type: text/xml" \ $ curl -u username:p4ssw0rd -H "Content-Type: text/xml" \
-d "project[name]=Build a treehouse for the kids" \ -d "&lt;project&gt;&lt;name&gt;Build a treehouse for the kids&lt;/name&gt;&lt;/project&gt;" \
<%= home_url %>projects.xml -i <%= home_url %>projects.xml -i
&gt;&gt; HTTP/1.1 201 Created &gt;&gt; HTTP/1.1 201 Created
Location: <%= home_url %>projects/65.xml Location: <%= home_url %>projects/65.xml
@ -86,7 +86,7 @@ Location: <%= home_url %>projects/65.xml
<pre> <pre>
<code> <code>
$ curl -u username:p4ssw0rd -H "Content-Type: text/xml" \ $ curl -u username:p4ssw0rd -H "Content-Type: text/xml" \
-d "todo[description]=Model treehouse in SketchUp&#38;todo[context_id]=2&#38;todo[project_id]=65" \ -d "&lt;todo&gt;&lt;description&gt;Model treehouse in SketchUp&lt;/description&gt;&lt;context_id&gt;2&lt;/context_id&gt;&lt;project_id&gt;65&lt;project_id&gt;" \
<%= home_url %>todos.xml -i <%= home_url %>todos.xml -i
&gt;&gt; HTTP/1.1 201 Created &gt;&gt; HTTP/1.1 201 Created
Location: <%= home_url %>todos/452.xml Location: <%= home_url %>todos/452.xml
@ -99,7 +99,7 @@ Location: <%= home_url %>todos/452.xml
<pre> <pre>
<code> <code>
$ curl -u username:p4ssw0rd -H "Content-Type: text/xml" -X PUT \ $ curl -u username:p4ssw0rd -H "Content-Type: text/xml" -X PUT \
-d "todo[notes]=use maple texture" \ -d "&lt;todo&gt;&lt;notes&gt;use maple texture&lt;/notes&gt;&lt;/todos&gt;" \
<%= home_url %>todos/452.xml -i <%= home_url %>todos/452.xml -i
&gt;&gt; HTTP/1.1 200 OK &gt;&gt; HTTP/1.1 200 OK
... ...

2
app/views/todos/new.m.erb
View file

@ -1,5 +1,5 @@
<% form_tag formatted_todos_path(:m), :method => :post do %> <% form_tag formatted_todos_path(:m), :method => :post do %>
<%= render :partial => 'edit_mobile' %> <%= render :partial => 'edit_mobile' %>
<p><input type="submit" value="Create" tabindex="6" /></p> <p><input type="submit" value="Create" tabindex="6" accesskey="#" /></p>
<% end -%> <% end -%>
<%= link_to "Back", @return_path %> <%= link_to "Back", @return_path %>

11
config/environment.rb.tmpl
View file

@ -99,6 +99,11 @@ TRACKS_COOKIES_SECURE = false
MOBILE_CONTENT_TYPE = 'tracks/mobile' MOBILE_CONTENT_TYPE = 'tracks/mobile'
Mime::Type.register(MOBILE_CONTENT_TYPE, :m) Mime::Type.register(MOBILE_CONTENT_TYPE, :m)
TRACKS_VERSION='1.7-devel' tracks_version='1.7-devel'
info=`git log --pretty=format:"%ai" -1`
TRACKS_VERSION=TRACKS_VERSION+' ('+info+')' # comment out next two lines if you do not want (or can not) the date of the
# last git commit in the footer
info=`git log --pretty=format:"%ai" -1`+
tracks_version=tracks_version + ' ('+info+')'
TRACKS_VERSION=tracks_version

2
public/javascripts/controls.js vendored
View file

@ -211,7 +211,7 @@ Autocompleter.Base = Class.create({
markPrevious: function() { markPrevious: function() {
if(this.index > 0) this.index-- if(this.index > 0) this.index--
else this.index = this.entryCount-1; else this.index = this.entryCount-1;
this.getEntry(this.index).scrollIntoView(true); this.getEntry(this.index).scrollIntoView(false);
}, },
markNext: function() { markNext: function() {