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.

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

Hi! I cleaned up your code for you! #1

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
The MIT License

Copyright (c) 2009 Gareth Rushgrove

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
Expand Down
10 changes: 5 additions & 5 deletions README.textile
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ The application has an optional message queue backend which can be enabled in th

Other AMQP compliant message queues should work but it's currently only tested with Rabbit.

If you are intending to do any development on Asteroid, or just want to look more closely at the code, I'd recommend installing
If you are intending to do any development on Asteroid, or just want to look more closely at the code, I'd recommend installing

* Clue - "http://github.com/garethr/django-clue/tree/master":http://github.com/garethr/django-clue/tree/master
* Test Extensions - "http://github.com/garethr/django-test-extensions/tree/master":http://github.com/garethr/django-test-extensions/tree/master
Expand Down Expand Up @@ -74,19 +74,19 @@ This is an early release that just about _works for me_. I can already see a num
h2. Licence

The MIT License

Copyright (c) 2009 Gareth Rushgrove

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
Expand Down
6 changes: 3 additions & 3 deletions asteroid/media/css/base.css
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ section>footer {
}
section>footer a {
color: #CCC;
}
}
section#main {
width: 90%;
margin: 0 auto;
Expand Down Expand Up @@ -105,7 +105,7 @@ li.failed a {
color: #FFF;
padding: 1px 15px;
font-size: 75%;

}
.commands li a.button:hover {
background: #ACACAC;
Expand Down Expand Up @@ -133,7 +133,7 @@ section.run nav {
font-size: 75%;
}
section.run nav a {
color: #CCC;
color: #CCC;
}

pre {
Expand Down
4 changes: 2 additions & 2 deletions asteroid/runner/templates/list_runs.html
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ <h1>Runs</h1>
{% endfor %}
</ol>
{% endif %}

{% if runs.has_other_pages %}
<div class="pagination">
<span class="step-links">
Expand All @@ -39,7 +39,7 @@ <h1>Runs</h1>
</span>
</div>
{% endif %}

</section>

{% endblock %}
2 changes: 1 addition & 1 deletion asteroid/runner/templates/registration/login.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
Der Login-Vorgang war nicht erfolgreich. Die Benutzer/Passwort-Kombination ist im System nicht bekannt.
</p>
{% endif %}

<form id="login_form" method="post" action="{% url django.contrib.auth.views.login %}">{% csrf_token %}
{{ form.username.label_tag }}&nbsp;{{ form.username }}<br />
{{ form.password.label_tag }}&nbsp;{{ form.password }}<br />
Expand Down