Skip to content

Commit

Permalink
misc fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
Ross Karchner committed Mar 11, 2012
1 parent fde0904 commit a5bde9f
Show file tree
Hide file tree
Showing 11 changed files with 11 additions and 51 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,5 @@ var/
.DS_Store?
ehthumbs.db
Icon?
Thumbs.db
Thumbs.db
app.yaml
1 change: 1 addition & 0 deletions appengine_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
from logging import error


sys.path= [os.path.join(os.path.dirname(__file__), 'shared'), os.path.join(os.path.dirname(__file__), '.')]+sys.path



Expand Down
1 change: 0 additions & 1 deletion main.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
from google.appengine.ext.webapp import util


sys.path= [os.path.join(os.path.dirname(__file__), 'shared'), os.path.join(os.path.dirname(__file__), '.')]+sys.path


# Django imports and other code go here...
Expand Down
15 changes: 0 additions & 15 deletions static/event-add.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,21 +19,6 @@ $(function() {
max_chars: 250
});




if ($("#id_description").val() == ""){
$("#event_description").hide();
var add_descriptions;
add_days=$('<div><em>No link? You can <a href="#">add an short description instead</a></em>.</div>').click(function(){
$("#event_description").show()
$(this).hide();
return false;
})

$("#link").append(add_days)
}


if ($("#end_date input").val() == ""){
$("#end_date").hide();
Expand Down
4 changes: 0 additions & 4 deletions templates/account/edit_profile_form.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,4 @@
{{form.link}} <span class="help">{{form.link.help_text}}</span>
{{form.link.errors}}
</div>
<div class="field">{{form.subscribe.label_tag}}
{{form.subscribe}} <span class="help">{{form.subscribe.help_text}}</span>
{{form.subscribe.errors}}
</div>
</fieldset>
4 changes: 2 additions & 2 deletions templates/base-cacheable.html
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@
<script>
$(function(){
window.setTimeout(function(){
$("#messages li").fadeOut()
$("#messages li").fadeOut()
}, 7000);


$(".datepicker").datepicker();
$(".datepicker").datepicker();



Expand Down
6 changes: 3 additions & 3 deletions templates/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@
$("#messages li").fadeOut()
}, 7000);

if (!Modernizr.inputtypes.date || $.browser.name== 'chrome'){
$(".datepicker").datepicker();

$(".datepicker").datepicker();

}




Expand Down
6 changes: 0 additions & 6 deletions templates/events/add.html
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,6 @@ <h2>add an event</h2>
{{form.link.errors}}
</div>

<div class="field" id="event_description">{{form.description.label_tag}}
{{form.description}}
<span id="description_charlimit">This description can be 250 characters long</span>
{{form.description.errors}}
</div>


<div class="field fakeplaceholderOK">
{{form.location.label_tag}}
Expand Down
4 changes: 1 addition & 3 deletions templates/events/one_event.html
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,7 @@ <h3 class="summary entry-title">{{ event|eventlink|safe }}</h3>
{% if event.link %}

{% else %}
{% if event.description %}
<em> {{ event.description }}</em>
{% endif %}

{% endif %}
{% if event.source %}

Expand Down
5 changes: 0 additions & 5 deletions templates/events/one_event_thisweek.html
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,6 @@ <h3 class="summary entry-title">{{ event|eventlink|safe }}</h3>
{% if event.cost %}
<div>{{ event.cost}}</div>
{% endif %}
{% if event.description and event.link %}

{% else %}{% if event.description %}
<em> {{ event.description }}</em>
{% endif %}{% endif %}
{% if event.source %}

{% if event.credit_link %}
Expand Down
13 changes: 2 additions & 11 deletions templates/eventsite/sidebar.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,8 @@

</div>

<div>


<h2>Subscribe to {{site.name}}</h2>
<form method="post" action="/subscriptions/new/">
<input id="id_email" type="text" name="email" maxlength="255" placeholder="[email protected]">
<input type="Submit" value="Subscribe"/>
</form>

</div>
<div id="ical">Or, get the <a href="webcal://{{site.host}}/ical">iCal</a>

<div id="ical">get the <a href="webcal://{{site.host}}/ical">iCal</a>
or <a href="/thisweek.xml">RSS feed</a>
</div>

Expand Down

0 comments on commit a5bde9f

Please sign in to comment.