Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--euscanwww/djeuscan/migrations/0014_auto.py206
-rw-r--r--euscanwww/djeuscan/models.py1
-rw-r--r--euscanwww/djeuscan/templates/euscan/category.html4
-rw-r--r--euscanwww/djeuscan/templates/euscan/herd.html4
-rw-r--r--euscanwww/djeuscan/templates/euscan/maintainer.html4
-rw-r--r--euscanwww/djeuscan/templates/euscan/overlay.html4
-rw-r--r--euscanwww/djeuscan/templates/euscan/package.html26
-rw-r--r--euscanwww/djeuscan/utils.py4
-rw-r--r--euscanwww/djeuscan/views.py13
-rw-r--r--euscanwww/htdocs/img/refresh-active.pngbin0 -> 1919 bytes
-rw-r--r--euscanwww/htdocs/img/refresh-inactive.pngbin0 -> 1809 bytes
-rw-r--r--euscanwww/htdocs/img/unwatch-icon.pngbin0 -> 2000 bytes
-rw-r--r--euscanwww/htdocs/img/watch-icon.pngbin0 -> 1758 bytes
13 files changed, 247 insertions, 19 deletions
diff --git a/euscanwww/djeuscan/migrations/0014_auto.py b/euscanwww/djeuscan/migrations/0014_auto.py
new file mode 100644
index 0000000..74cc7c3
--- /dev/null
+++ b/euscanwww/djeuscan/migrations/0014_auto.py
@@ -0,0 +1,206 @@
+# -*- coding: utf-8 -*-
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+ def forwards(self, orm):
+ # Adding M2M table for field users on 'RefreshPackageQuery'
+ db.create_table('djeuscan_refreshpackagequery_users', (
+ ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)),
+ ('refreshpackagequery', models.ForeignKey(orm['djeuscan.refreshpackagequery'], null=False)),
+ ('user', models.ForeignKey(orm['auth.user'], null=False))
+ ))
+ db.create_unique('djeuscan_refreshpackagequery_users', ['refreshpackagequery_id', 'user_id'])
+
+ def backwards(self, orm):
+ # Removing M2M table for field users on 'RefreshPackageQuery'
+ db.delete_table('djeuscan_refreshpackagequery_users')
+
+ models = {
+ 'auth.group': {
+ 'Meta': {'object_name': 'Group'},
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+ 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+ },
+ 'auth.permission': {
+ 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+ 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+ 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+ },
+ 'auth.user': {
+ 'Meta': {'object_name': 'User'},
+ 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+ 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+ 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+ 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+ 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+ 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+ 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+ 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+ 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+ },
+ 'contenttypes.contenttype': {
+ 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+ 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+ },
+ 'djeuscan.categoryassociation': {
+ 'Meta': {'unique_together': "(['user', 'category'],)", 'object_name': 'CategoryAssociation'},
+ 'category': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
+ },
+ 'djeuscan.categorylog': {
+ 'Meta': {'object_name': 'CategoryLog', '_ormbases': ['djeuscan.Log']},
+ 'category': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+ 'log_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['djeuscan.Log']", 'unique': 'True', 'primary_key': 'True'})
+ },
+ 'djeuscan.euscanresult': {
+ 'Meta': {'object_name': 'EuscanResult'},
+ 'datetime': ('django.db.models.fields.DateTimeField', [], {}),
+ 'ebuild': ('django.db.models.fields.CharField', [], {'max_length': '256', 'blank': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'package': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['djeuscan.Package']"}),
+ 'result': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+ 'scan_time': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'})
+ },
+ 'djeuscan.herd': {
+ 'Meta': {'object_name': 'Herd'},
+ 'email': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
+ 'herd': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '128'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'maintainers': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['djeuscan.Maintainer']", 'symmetrical': 'False'})
+ },
+ 'djeuscan.herdassociation': {
+ 'Meta': {'unique_together': "(['user', 'herd'],)", 'object_name': 'HerdAssociation'},
+ 'herd': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['djeuscan.Herd']"}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
+ },
+ 'djeuscan.herdlog': {
+ 'Meta': {'object_name': 'HerdLog', '_ormbases': ['djeuscan.Log']},
+ 'herd': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['djeuscan.Herd']"}),
+ 'log_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['djeuscan.Log']", 'unique': 'True', 'primary_key': 'True'})
+ },
+ 'djeuscan.log': {
+ 'Meta': {'object_name': 'Log'},
+ 'datetime': ('django.db.models.fields.DateTimeField', [], {}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'n_packages_gentoo': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+ 'n_packages_outdated': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+ 'n_packages_overlay': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+ 'n_versions_gentoo': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+ 'n_versions_overlay': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+ 'n_versions_upstream': ('django.db.models.fields.IntegerField', [], {'default': '0'})
+ },
+ 'djeuscan.maintainer': {
+ 'Meta': {'object_name': 'Maintainer'},
+ 'email': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '128'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '128'})
+ },
+ 'djeuscan.maintainerassociation': {
+ 'Meta': {'unique_together': "(['user', 'maintainer'],)", 'object_name': 'MaintainerAssociation'},
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'maintainer': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['djeuscan.Maintainer']"}),
+ 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
+ },
+ 'djeuscan.maintainerlog': {
+ 'Meta': {'object_name': 'MaintainerLog', '_ormbases': ['djeuscan.Log']},
+ 'log_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['djeuscan.Log']", 'unique': 'True', 'primary_key': 'True'}),
+ 'maintainer': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['djeuscan.Maintainer']"})
+ },
+ 'djeuscan.overlayassociation': {
+ 'Meta': {'unique_together': "(['user', 'overlay'],)", 'object_name': 'OverlayAssociation'},
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'overlay': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+ 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
+ },
+ 'djeuscan.package': {
+ 'Meta': {'unique_together': "(['category', 'name'],)", 'object_name': 'Package'},
+ 'category': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+ 'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+ 'herds': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['djeuscan.Herd']", 'symmetrical': 'False', 'blank': 'True'}),
+ 'homepage': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'last_version_gentoo': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'last_version_gentoo'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['djeuscan.Version']"}),
+ 'last_version_overlay': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'last_version_overlay'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['djeuscan.Version']"}),
+ 'last_version_upstream': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'last_version_upstream'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['djeuscan.Version']"}),
+ 'maintainers': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['djeuscan.Maintainer']", 'symmetrical': 'False', 'blank': 'True'}),
+ 'n_overlay': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+ 'n_packaged': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+ 'n_versions': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '128'})
+ },
+ 'djeuscan.packageassociation': {
+ 'Meta': {'unique_together': "(['user', 'package'],)", 'object_name': 'PackageAssociation'},
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'package': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['djeuscan.Package']"}),
+ 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
+ },
+ 'djeuscan.problemreport': {
+ 'Meta': {'object_name': 'ProblemReport'},
+ 'datetime': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'message': ('django.db.models.fields.TextField', [], {}),
+ 'package': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['djeuscan.Package']"}),
+ 'subject': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+ 'version': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['djeuscan.Version']", 'null': 'True', 'blank': 'True'})
+ },
+ 'djeuscan.refreshpackagequery': {
+ 'Meta': {'object_name': 'RefreshPackageQuery'},
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'package': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['djeuscan.Package']"}),
+ 'priority': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+ 'users': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.User']", 'symmetrical': 'False'})
+ },
+ 'djeuscan.version': {
+ 'Meta': {'unique_together': "(['package', 'slot', 'revision', 'version', 'overlay'],)", 'object_name': 'Version'},
+ 'alive': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'db_index': 'True'}),
+ 'confidence': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+ 'ebuild_path': ('django.db.models.fields.CharField', [], {'max_length': '256', 'blank': 'True'}),
+ 'handler': ('django.db.models.fields.CharField', [], {'max_length': '128', 'blank': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'metadata_path': ('django.db.models.fields.CharField', [], {'max_length': '256', 'blank': 'True'}),
+ 'overlay': ('django.db.models.fields.CharField', [], {'default': "'gentoo'", 'max_length': '128', 'db_index': 'True', 'blank': 'True'}),
+ 'package': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['djeuscan.Package']"}),
+ 'packaged': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'revision': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+ 'slot': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '128', 'blank': 'True'}),
+ 'urls': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+ 'version': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+ 'vtype': ('django.db.models.fields.CharField', [], {'max_length': '128', 'blank': 'True'})
+ },
+ 'djeuscan.versionlog': {
+ 'Meta': {'object_name': 'VersionLog'},
+ 'action': ('django.db.models.fields.IntegerField', [], {}),
+ 'datetime': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'overlay': ('django.db.models.fields.CharField', [], {'default': "'gentoo'", 'max_length': '128', 'blank': 'True'}),
+ 'package': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['djeuscan.Package']"}),
+ 'packaged': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'revision': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+ 'slot': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '128', 'blank': 'True'}),
+ 'version': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+ 'vtype': ('django.db.models.fields.CharField', [], {'max_length': '128', 'blank': 'True'})
+ },
+ 'djeuscan.worldlog': {
+ 'Meta': {'object_name': 'WorldLog', '_ormbases': ['djeuscan.Log']},
+ 'log_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['djeuscan.Log']", 'unique': 'True', 'primary_key': 'True'})
+ }
+ }
+
+ complete_apps = ['djeuscan'] \ No newline at end of file
diff --git a/euscanwww/djeuscan/models.py b/euscanwww/djeuscan/models.py
index 5c70c45..5101ea8 100644
--- a/euscanwww/djeuscan/models.py
+++ b/euscanwww/djeuscan/models.py
@@ -277,6 +277,7 @@ class MaintainerLog(Log):
class RefreshPackageQuery(models.Model):
package = models.ForeignKey(Package)
priority = models.IntegerField(default=0)
+ users = models.ManyToManyField(User)
def __unicode__(self):
return u'[%d] %s' % (self.priority, self.package)
diff --git a/euscanwww/djeuscan/templates/euscan/category.html b/euscanwww/djeuscan/templates/euscan/category.html
index f4f123c..8474914 100644
--- a/euscanwww/djeuscan/templates/euscan/category.html
+++ b/euscanwww/djeuscan/templates/euscan/category.html
@@ -21,10 +21,10 @@
{% if user.is_authenticated %}
<button class="btn favourite-button {% if favourited %}hide{% endif %}" data-url="{% url "favourite_category" category %}">
- Watch
+ <img src="{{ STATIC_URL}}/img/watch-icon.png" alt="Watch" >
</button>
<button class="btn unfavourite-button {% if not favourited %}hide{% endif %}" data-url="{% url "unfavourite_category" category %}">
- Unwatch
+ <img src="{{ STATIC_URL}}/img/unwatch-icon.png" alt="Unwatch" >
</button>
{% endif %}
</h2>
diff --git a/euscanwww/djeuscan/templates/euscan/herd.html b/euscanwww/djeuscan/templates/euscan/herd.html
index c940556..3dc1969 100644
--- a/euscanwww/djeuscan/templates/euscan/herd.html
+++ b/euscanwww/djeuscan/templates/euscan/herd.html
@@ -20,10 +20,10 @@
Herd: {{ herd.herd }}
{% if user.is_authenticated %}
<button class="btn favourite-button {% if favourited %}hide{% endif %}" data-url="{% url "favourite_herd" herd.herd %}">
- Watch
+ <img src="{{ STATIC_URL}}/img/watch-icon.png" alt="Watch" >
</button>
<button class="btn unfavourite-button {% if not favourited %}hide{% endif %}" data-url="{% url "unfavourite_herd" herd.herd %}">
- Unwatch
+ <img src="{{ STATIC_URL}}/img/unwatch-icon.png" alt="Unwatch" >
</button>
{% endif %}
diff --git a/euscanwww/djeuscan/templates/euscan/maintainer.html b/euscanwww/djeuscan/templates/euscan/maintainer.html
index a68f987..03bd60d 100644
--- a/euscanwww/djeuscan/templates/euscan/maintainer.html
+++ b/euscanwww/djeuscan/templates/euscan/maintainer.html
@@ -22,10 +22,10 @@
Maintainer: {{ maintainer.name }} &lt{{ maintainer.email }}&gt
{% if user.is_authenticated %}
<button class="btn favourite-button {% if favourited %}hide{% endif %}" data-url="{% url "favourite_maintainer" maintainer.id %}">
- Watch
+ <img src="{{ STATIC_URL}}/img/watch-icon.png" alt="Watch" >
</button>
<button class="btn unfavourite-button {% if not favourited %}hide{% endif %}" data-url="{% url "unfavourite_maintainer" maintainer.id %}">
- Unwatch
+ <img src="{{ STATIC_URL}}/img/unwatch-icon.png" alt="Unwatch" >
</button>
{% endif %}
</h2>
diff --git a/euscanwww/djeuscan/templates/euscan/overlay.html b/euscanwww/djeuscan/templates/euscan/overlay.html
index 21e6a3c..46249ea 100644
--- a/euscanwww/djeuscan/templates/euscan/overlay.html
+++ b/euscanwww/djeuscan/templates/euscan/overlay.html
@@ -12,10 +12,10 @@
Overlay: {{ overlay }}
{% if user.is_authenticated %}
<button class="btn favourite-button {% if favourited %}hide{% endif %}" data-url="{% url "favourite_overlay" overlay %}">
- Watch
+ <img src="{{ STATIC_URL}}/img/watch-icon.png" alt="Watch" >
</button>
<button class="btn unfavourite-button {% if not favourited %}hide{% endif %}" data-url="{% url "unfavourite_overlay" overlay %}">
- Unwatch
+ <img src="{{ STATIC_URL}}/img/unwatch-icon.png" alt="Unwatch" >
</button>
{% endif %}
diff --git a/euscanwww/djeuscan/templates/euscan/package.html b/euscanwww/djeuscan/templates/euscan/package.html
index ef4b753..416cd03 100644
--- a/euscanwww/djeuscan/templates/euscan/package.html
+++ b/euscanwww/djeuscan/templates/euscan/package.html
@@ -36,15 +36,20 @@
{{ package.category }}/{{ package.name }}
{% if user.is_authenticated %}
- <button class="btn refresh-button" data-category="{{ package.category }}" data-package="{{ package.name }}">
- Refresh
- </button>
- <button class="btn favourite-button {% if favourited %}hide{% endif %}" data-url="{% url "favourite_package" package.category package.name %}">
- Watch
- </button>
- <button class="btn unfavourite-button {% if not favourited %}hide{% endif %}" data-url="{% url "unfavourite_package" package.category package.name %}">
- Unwatch
- </button>
+ <span class="pull-right">
+ <button class="btn refresh-button {% if refreshed %}hide{% endif %}" data-category="{{ package.category }}" data-package="{{ package.name }}">
+ <img src="{{ STATIC_URL}}/img/refresh-active.png" alt="Refresh" >
+ </button>
+ <button class="btn refresh-button-disabled disabled {% if not refreshed %}hide{% endif %}">
+ <img src="{{ STATIC_URL}}/img/refresh-inactive.png" alt="Refresh" >
+ </button>
+ <button class="btn favourite-button {% if favourited %}hide{% endif %}" data-url="{% url "favourite_package" package.category package.name %}">
+ <img src="{{ STATIC_URL}}/img/watch-icon.png" alt="Watch" >
+ </button>
+ <button class="btn unfavourite-button {% if not favourited %}hide{% endif %}" data-url="{% url "unfavourite_package" package.category package.name %}">
+ <img src="{{ STATIC_URL}}/img/unwatch-icon.png" alt="Unwatch" >
+ </button>
+ </span>
{% endif %}
</h2>
<dl>
@@ -207,7 +212,8 @@
var url = "{% url "refresh_package" "XXX" "YYY" %}";
$.post(url.replace("XXX", $(this).data("category")).replace("YYY", $(this).data("package")),
function() {
- alert("Submitted!");
+ $(".refresh-button").addClass("hide");
+ $(".refresh-button-disabled").removeClass("hide");
});
});
diff --git a/euscanwww/djeuscan/utils.py b/euscanwww/djeuscan/utils.py
index 79565e8..60965e0 100644
--- a/euscanwww/djeuscan/utils.py
+++ b/euscanwww/djeuscan/utils.py
@@ -68,7 +68,7 @@ def plaintext2html(text, tabstop=4):
prefix = ''
last = m.groups()[-1]
if last in ['\n', '\r', '\r\n']:
- last = '<br>'
+ last = '<br/>'
return '%s%s' % (prefix, url)
re_string = re.compile(
r'(?P<htmlchars>[<&>])|(?P<space>^[ \t]+)|(?P<lineend>\r\n|\r|\n)|'
@@ -77,6 +77,8 @@ def plaintext2html(text, tabstop=4):
)
result = re.sub(re_string, do_sub, text)
+ result = re.sub(r"\\n", "<br/>", result)
+
result = recolor('cyan', result)
result = recolor('blue', result)
result = recolor('red', result)
diff --git a/euscanwww/djeuscan/views.py b/euscanwww/djeuscan/views.py
index 09f48b9..b1eb056 100644
--- a/euscanwww/djeuscan/views.py
+++ b/euscanwww/djeuscan/views.py
@@ -216,6 +216,12 @@ def package(request, category, package):
else:
favourited = True
+ try:
+ refreshed = request.user in \
+ RefreshPackageQuery.objects.get(package=package).users.all()
+ except RefreshPackageQuery.DoesNotExist:
+ refreshed = False
+
thanks_for_reporting = False
if request.method == "POST":
problem_form = ProblemReportForm(package, request.POST)
@@ -238,6 +244,7 @@ def package(request, category, package):
'vlog': vlog,
'last_scan': last_scan,
'favourited': favourited,
+ 'refreshed': refreshed,
'problem_form': problem_form,
'thanks_for_reporting': thanks_for_reporting
}
@@ -352,6 +359,12 @@ def refresh_package(request, category, package):
pkg = get_object_or_404(Package, category=category, name=package)
obj, created = RefreshPackageQuery.objects.get_or_create(package=pkg)
+
+ if request.user in \
+ RefreshPackageQuery.objects.get(package=pkg).users.all():
+ return {"result": "failure"}
+
+ obj.users.add(request.user)
if not created:
obj.priority += 1
obj.save()
diff --git a/euscanwww/htdocs/img/refresh-active.png b/euscanwww/htdocs/img/refresh-active.png
new file mode 100644
index 0000000..c4b88d7
--- /dev/null
+++ b/euscanwww/htdocs/img/refresh-active.png
Binary files differ
diff --git a/euscanwww/htdocs/img/refresh-inactive.png b/euscanwww/htdocs/img/refresh-inactive.png
new file mode 100644
index 0000000..457c6c9
--- /dev/null
+++ b/euscanwww/htdocs/img/refresh-inactive.png
Binary files differ
diff --git a/euscanwww/htdocs/img/unwatch-icon.png b/euscanwww/htdocs/img/unwatch-icon.png
new file mode 100644
index 0000000..f6875a6
--- /dev/null
+++ b/euscanwww/htdocs/img/unwatch-icon.png
Binary files differ
diff --git a/euscanwww/htdocs/img/watch-icon.png b/euscanwww/htdocs/img/watch-icon.png
new file mode 100644
index 0000000..c341241
--- /dev/null
+++ b/euscanwww/htdocs/img/watch-icon.png
Binary files differ