repo
string
commit
string
message
string
diff
string
rdno/pardus-network-manager-gtk
a276e3ef90f7a3e0d947031e021fb101813d0882
wireless no auth fix
diff --git a/network_manager_gtk/widgets.py b/network_manager_gtk/widgets.py index 846d7b1..38c0aca 100644 --- a/network_manager_gtk/widgets.py +++ b/network_manager_gtk/widgets.py @@ -1,422 +1,425 @@ #!/usr/bin/python # -*- coding: utf-8 -*- # # Rıdvan Örsvuran (C) 2009 # # This program is free software: you...
rdno/pardus-network-manager-gtk
7c95d8a561481d81eebdd4c932dd99dc7d9d4005
added WirelessSection
diff --git a/network_manager_gtk/widgets.py b/network_manager_gtk/widgets.py index 4c63fcd..846d7b1 100644 --- a/network_manager_gtk/widgets.py +++ b/network_manager_gtk/widgets.py @@ -1,404 +1,422 @@ #!/usr/bin/python # -*- coding: utf-8 -*- # # Rıdvan Örsvuran (C) 2009 # # This program is free software: you...
rdno/pardus-network-manager-gtk
8d1359f89ff1a0b88814cf459e9bc39af469796d
network settings frame done
diff --git a/network_manager_gtk/widgets.py b/network_manager_gtk/widgets.py index 0229621..4c63fcd 100644 --- a/network_manager_gtk/widgets.py +++ b/network_manager_gtk/widgets.py @@ -1,396 +1,404 @@ #!/usr/bin/python # -*- coding: utf-8 -*- # # Rıdvan Örsvuran (C) 2009 # # This program is free software: you...
rdno/pardus-network-manager-gtk
c57706ffbbc125351ca6b84195798d737cbd9a52
added support for creating emacs tags file
diff --git a/make.py b/make.py index 11d7291..e7bc2be 100755 --- a/make.py +++ b/make.py @@ -1,38 +1,44 @@ #!/usr/bin/python # -*- coding: utf-8 -*- # # Rıdvan Örsvuran (C) 2009 import os import sys LANGS = ["en", "tr"] def mo(): for lang in LANGS: os.system("mkdir -p locale/%s/LC_MESSAGES" % la...
rdno/pardus-network-manager-gtk
924c937f9113e9d6e71684f4919fc54367ea27b7
started refactoring messy code
diff --git a/network_manager_gtk/widgets.py b/network_manager_gtk/widgets.py index 4e2fd1d..0229621 100644 --- a/network_manager_gtk/widgets.py +++ b/network_manager_gtk/widgets.py @@ -1,372 +1,396 @@ #!/usr/bin/python # -*- coding: utf-8 -*- # # Rıdvan Örsvuran (C) 2009 # # This program is free software: you...
rdno/pardus-network-manager-gtk
1954e2c4a1581d0c666e834e0f6f0a345fc98fb4
wireless items as a list (list can't contain widgets :( maybe add img later)
diff --git a/network_manager_gtk/widgets.py b/network_manager_gtk/widgets.py index 4b5976e..4e2fd1d 100644 --- a/network_manager_gtk/widgets.py +++ b/network_manager_gtk/widgets.py @@ -1,390 +1,372 @@ #!/usr/bin/python # -*- coding: utf-8 -*- # # Rıdvan Örsvuran (C) 2009 # # This program is free software: you...
rdno/pardus-network-manager-gtk
0b72e4e504f4f094b584962f1b50c7b099566ba9
support for scanning wireless networks
diff --git a/network_manager_gtk/widgets.py b/network_manager_gtk/widgets.py index ec8ca1b..4b5976e 100644 --- a/network_manager_gtk/widgets.py +++ b/network_manager_gtk/widgets.py @@ -1,303 +1,390 @@ #!/usr/bin/python # -*- coding: utf-8 -*- # # Rıdvan Örsvuran (C) 2009 # # This program is free software: you...
rdno/pardus-network-manager-gtk
5bb6f9ccfe682135acd1c32a863ed9722f8c6e40
added wireless support to edit window
diff --git a/network_manager_gtk/widgets.py b/network_manager_gtk/widgets.py index 14b047a..ec8ca1b 100644 --- a/network_manager_gtk/widgets.py +++ b/network_manager_gtk/widgets.py @@ -1,255 +1,303 @@ #!/usr/bin/python # -*- coding: utf-8 -*- # # Rıdvan Örsvuran (C) 2009 # # This program is free software: you...
rdno/pardus-network-manager-gtk
c6a792b675b2cdf706db196e02fe7ff38b451540
added shadow :)
diff --git a/ui/main.glade b/ui/main.glade index 3745158..f092dd8 100644 --- a/ui/main.glade +++ b/ui/main.glade @@ -1,22 +1,23 @@ <?xml version="1.0"?> <glade-interface> <!-- interface-requires gtk+ 2.16 --> <!-- interface-naming-policy project-wide --> <widget class="GtkWindow" id="window_main"> <prop...
rdno/pardus-network-manager-gtk
38a0816d9102ff837211d5d8af80f3fbf606eeae
forgot o add edit.glade file :)
diff --git a/ui/edit.glade b/ui/edit.glade new file mode 100644 index 0000000..84aa68c --- /dev/null +++ b/ui/edit.glade @@ -0,0 +1,506 @@ +<?xml version="1.0"?> +<glade-interface> + <!-- interface-requires gtk+ 2.16 --> + <!-- interface-naming-policy project-wide --> + <widget class="GtkWindow" id="window_edit"> + ...
rdno/pardus-network-manager-gtk
d02e15a8c74778a223b1f67e5b8e250cca490fee
added edit window; can show settings now;
diff --git a/make.py b/make.py index ae34a54..11d7291 100755 --- a/make.py +++ b/make.py @@ -1,37 +1,38 @@ #!/usr/bin/python # -*- coding: utf-8 -*- # # Rıdvan Örsvuran (C) 2009 import os import sys LANGS = ["en", "tr"] def mo(): for lang in LANGS: os.system("mkdir -p locale/%s/LC_MESSAGES" % la...
rdno/pardus-network-manager-gtk
e584bf80c1f20e62d429ab64564005096f4eb435
added README
diff --git a/README b/README new file mode 100644 index 0000000..8fac39c --- /dev/null +++ b/README @@ -0,0 +1,15 @@ +Network Manager GTK is port of Pardus network-manager. +It uses same backend of qt version. +It is not good enough for installing. + +Make mo files with + + $ ./make mo + + +and start program + + $...
rdno/pardus-network-manager-gtk
48892dcdae566bc1a5a078379059effedf0b9302
making mo changed
diff --git a/make.py b/make.py index aabea8d..ae34a54 100755 --- a/make.py +++ b/make.py @@ -1,28 +1,37 @@ #!/usr/bin/python # -*- coding: utf-8 -*- # # Rıdvan Örsvuran (C) 2009 import os import sys LANGS = ["en", "tr"] def mo(): for lang in LANGS: os.system("mkdir -p locale/%s/LC_MESSAGES" % la...
rdno/pardus-network-manager-gtk
ded13675e023f94c41177803341ed1480d8024d5
added POTFILES.in
diff --git a/network_manager_gtk/__init__.py b/network_manager_gtk/__init__.py index 8b13789..c89582d 100644 --- a/network_manager_gtk/__init__.py +++ b/network_manager_gtk/__init__.py @@ -1 +1 @@ - +__all__ = ["translation", "widgets"] diff --git a/network_manager_gtk/widgets.py b/network_manager_gtk/widgets.py index ...
rdno/pardus-network-manager-gtk
8af4ada5224a8baebb2336c61b37c2940353b2a7
new folder structure
diff --git a/network-manager-gtk.py b/network-manager-gtk.py new file mode 100755 index 0000000..509d4ec --- /dev/null +++ b/network-manager-gtk.py @@ -0,0 +1,101 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- + +# +# Rıdvan Örsvuran (C) 2009 +# +# This program is free software: you can redistribute it and/or modify ...
rdno/pardus-network-manager-gtk
1e44433352bf7b829a8d475521aca3d381e6e433
-m "fixed glade translation"
diff --git a/main.py b/main.py index 14d1746..634fb79 100755 --- a/main.py +++ b/main.py @@ -1,179 +1,180 @@ #!/usr/bin/python # -*- coding: utf-8 -*- # # Rıdvan Örsvuran (C) 2009 # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License a...
rdno/pardus-network-manager-gtk
71fd5524e76b277d0875ad9e669701e08c36e0f6
connections in a scrolled window basic translation
diff --git a/main.py b/main.py index 76abea0..14d1746 100755 --- a/main.py +++ b/main.py @@ -1,149 +1,179 @@ #!/usr/bin/python # -*- coding: utf-8 -*- # # Rıdvan Örsvuran (C) 2009 # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License a...
rdno/pardus-network-manager-gtk
5f498b25f85e1eee11dd6a52beb6f1864be26e2c
listen comar for changes
diff --git a/main.py b/main.py old mode 100644 new mode 100755 index eeaae46..76abea0 --- a/main.py +++ b/main.py @@ -1,97 +1,149 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- + +# +# Rıdvan Örsvuran (C) 2009 +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU ...
rorist/rorist.github.com
de4ebaa7eabf253b69bee352e04e3c399bdc2d58
Add link to my gists
diff --git a/index.html b/index.html index 1aedd10..56c3cd7 100644 --- a/index.html +++ b/index.html @@ -1,9 +1,12 @@ <h1>My Projects</h1> <ul> <li> Network Discovery for Android: <a href="http://rorist.github.com/android-network-discovery/">Website</a> <a href="http://github.com/ror...
rorist/rorist.github.com
e55fd232b5535e024f1abf2d52f6f0f1a05df7f9
Projects listing
diff --git a/index.html b/index.html index 64355e7..1aedd10 100644 --- a/index.html +++ b/index.html @@ -1 +1,9 @@ -Nothing here +<h1>My Projects</h1> + +<ul> + <li> + Network Discovery for Android: + <a href="http://rorist.github.com/android-network-discovery/">Website</a> + <a href="http://git...
rorist/rorist.github.com
19a7ee99e173b0afa933fc22e4d47faaa2690696
Empty README file
diff --git a/README b/README new file mode 100644 index 0000000..e69de29
ThomasPedersen/mattespill
17b8aea1fae25d9eb4e5250eb06d503ead9bfc28
Indent in comments for epydoc
diff --git a/main/forms.py b/main/forms.py index c24df24..cf44aee 100644 --- a/main/forms.py +++ b/main/forms.py @@ -1,64 +1,64 @@ from django.contrib.auth.models import User, Group from django import forms default_errors = { 'required': 'This field is required', 'invalid': 'Enter a valid value' } class Si...
ThomasPedersen/mattespill
6da8558639a932fdbc4896a889d1aaea306fb742
comments
diff --git a/main/forms.py b/main/forms.py index 7faa468..c24df24 100644 --- a/main/forms.py +++ b/main/forms.py @@ -1,45 +1,64 @@ from django.contrib.auth.models import User, Group from django import forms default_errors = { - 'required': 'This field is required', - 'invalid': 'Enter a valid value' + 'requi...
ThomasPedersen/mattespill
110b4fb6fd81e26248d57456eed60a2f30c80d4b
pedobear bug
diff --git a/main/media/question.js b/main/media/question.js index 863c32e..0b1c258 100644 --- a/main/media/question.js +++ b/main/media/question.js @@ -1,151 +1,153 @@ var bearTimer; var expireTimer; function nl2br(str) { return (str + '').replace(/([^>\r\n]?)(\r\n|\n\r|\r|\n)/g, '$1' + '<br />' + '$2'); } ...
ThomasPedersen/mattespill
6d201d2b7fb8fce0812e22f4aec2bf9d0410105c
just in case
diff --git a/main/media/sounds/coins2.mp3 b/main/media/sounds/coins2.mp3 new file mode 100644 index 0000000..c04cf90 Binary files /dev/null and b/main/media/sounds/coins2.mp3 differ
ThomasPedersen/mattespill
0a6130d834db7e333644f09793f4dd85a4b92786
just in case
diff --git a/main/media/home.js b/main/media/home.js index 8fbc63a..a2aba82 100644 --- a/main/media/home.js +++ b/main/media/home.js @@ -1,7 +1,11 @@ $(function() { $('.restricted_room_msg').parent().hover(function() { $(this).find('.restricted_room_msg').fadeIn(100); }, function() { $(this).find('.restricte...
ThomasPedersen/mattespill
8cd2c626e2cbb6db6b106f4a67139f4d2ba7f11d
Non-working IE fix.
diff --git a/main/media/question.js b/main/media/question.js index b600803..0ea328f 100644 --- a/main/media/question.js +++ b/main/media/question.js @@ -1,150 +1,150 @@ var bearTimer; var expireTimer; function nl2br(str) { return (str + '').replace(/([^>\r\n]?)(\r\n|\n\r|\r|\n)/g, '$1' + '<br />' + '$2'); } ...
ThomasPedersen/mattespill
96f52c21cfe25e8d9ec53acadbaf300503430bc6
added more sounds
diff --git a/main/media/main.js b/main/media/main.js index 3e9dc85..216c0e2 100644 --- a/main/media/main.js +++ b/main/media/main.js @@ -1,38 +1,41 @@ var soundListener = new Object(); soundListener.onInit = function() {}; soundListener.onUpdate = function() {}; function getWindowWidth() { if (window.innerWid...
ThomasPedersen/mattespill
e6b1393556e01150e92b3142bc71f7a0784e6b6a
Another attempt at fixing IE crap bugs.
diff --git a/main/media/question.js b/main/media/question.js index 0ea328f..b600803 100644 --- a/main/media/question.js +++ b/main/media/question.js @@ -1,150 +1,150 @@ var bearTimer; var expireTimer; function nl2br(str) { return (str + '').replace(/([^>\r\n]?)(\r\n|\n\r|\r|\n)/g, '$1' + '<br />' + '$2'); } ...
ThomasPedersen/mattespill
598d81ccc0bab7461eb3ae7cf66f974ba981d7a2
enter press in question bug in IE 3
diff --git a/main/media/question.js b/main/media/question.js index 4bd490e..0ea328f 100644 --- a/main/media/question.js +++ b/main/media/question.js @@ -1,140 +1,150 @@ var bearTimer; var expireTimer; function nl2br(str) { return (str + '').replace(/([^>\r\n]?)(\r\n|\n\r|\r|\n)/g, '$1' + '<br />' + '$2'); } ...
ThomasPedersen/mattespill
b9e318bb69e55aecf18f03cd7bdfc367260d0432
enter press in question bug in IE 2
diff --git a/main/templates/question.html b/main/templates/question.html index 6fe8f81..99da12e 100644 --- a/main/templates/question.html +++ b/main/templates/question.html @@ -1,34 +1,34 @@ {% extends "outer.html" %} {% block head %} <link rel="stylesheet" href="/media/question.css" type="text/css" /> <script sr...
ThomasPedersen/mattespill
a8ded6fe90c4a95c03ea579c584dab9ce6121810
enter press in question bug in IE
diff --git a/main/templates/question.html b/main/templates/question.html index 3137345..6fe8f81 100644 --- a/main/templates/question.html +++ b/main/templates/question.html @@ -1,34 +1,34 @@ {% extends "outer.html" %} {% block head %} <link rel="stylesheet" href="/media/question.css" type="text/css" /> <script sr...
ThomasPedersen/mattespill
c8f140cf4a8b2c528c47278309dec34c3fb87a69
applause
diff --git a/main/media/main.css b/main/media/main.css index 632a447..6eef532 100644 --- a/main/media/main.css +++ b/main/media/main.css @@ -1,176 +1,179 @@ @font-face { font-family: Aller; font-weight: normal; src: url('fonts/Aller_Rg.ttf'); } @font-face { font-family: Aller; font-weight: bold; src: url...
ThomasPedersen/mattespill
c2e73263edd9f5fc961d4306684f342bbb80cafb
minor changes
diff --git a/main/views.py b/main/views.py index 0b1c6e5..3e3ef0c 100644 --- a/main/views.py +++ b/main/views.py @@ -1,248 +1,248 @@ # -*- coding: utf-8 -*- from django.template import RequestContext, Context, loader from django.utils import simplejson from django.http import HttpResponse, HttpResponseRedirect, H...
ThomasPedersen/mattespill
bf8f7651f87c47cb9c911e31c17a67356320d214
fixed db with example data
diff --git a/initial_data.json b/initial_data.json index a2b576e..b9744b2 100644 --- a/initial_data.json +++ b/initial_data.json @@ -1 +1 @@ -[{"pk": 22, "model": "auth.permission", "fields": {"codename": "add_logentry", "name": "Can add log entry", "content_type": 8}}, {"pk": 23, "model": "auth.permission", "fields": ...
ThomasPedersen/mattespill
334d93cf11818bae4f66713d8e341e1b6d7c00da
slidetoggle, forgot js file
diff --git a/main/media/groupstats.js b/main/media/groupstats.js new file mode 100644 index 0000000..a528474 --- /dev/null +++ b/main/media/groupstats.js @@ -0,0 +1,6 @@ +$(function() { + $('.group .toggle').hide(); + $('.group h2').css('cursor', 'pointer').click(function() { + $(this).siblings('.toggle').slideToggle(...
ThomasPedersen/mattespill
9975ba83fc0565179ebbbd1f0f6a0dee5bc941fd
penger = gullmynter
diff --git a/main/media/question.js b/main/media/question.js index 8d52f3f..7a584c8 100644 --- a/main/media/question.js +++ b/main/media/question.js @@ -1,137 +1,137 @@ var bearTimer; var expireTimer; function nl2br(str) { return (str + '').replace(/([^>\r\n]?)(\r\n|\n\r|\r|\n)/g, '$1' + '<br />' + '$2'); } ...
ThomasPedersen/mattespill
1bf299a090227b8b42f980a65b63ea43406883df
slidetoggle
diff --git a/main/templates/stats_grouped.html b/main/templates/stats_grouped.html index 2c92f59..16db6ac 100644 --- a/main/templates/stats_grouped.html +++ b/main/templates/stats_grouped.html @@ -1,35 +1,43 @@ {% extends "outer.html" %} {% block head %} <style type="text/css"> table tr.most_points td { backgro...
ThomasPedersen/mattespill
ea173103ce4600ae45218fc71159991fa33327d7
Removed Result and Turn from admin.
diff --git a/main/admin.py b/main/admin.py index a31f87a..a951560 100644 --- a/main/admin.py +++ b/main/admin.py @@ -1,17 +1,15 @@ from mattespill.main.models import Question, Room, Turn, Result, UserProfile, Hint from django.contrib import admin class QuestionAdmin(admin.ModelAdmin): ''' Django class for de...
ThomasPedersen/mattespill
db496ecce2cc760e4308a4a595cf5f5e6b769b6a
Added group to stats table.
diff --git a/main/templates/stats.html b/main/templates/stats.html index cd8eb5a..87000be 100644 --- a/main/templates/stats.html +++ b/main/templates/stats.html @@ -1,35 +1,37 @@ {% extends "outer.html" %} {% block head %} <style type="text/css"> table tr.most_points td { background-color: #aaffaa !important; ...
ThomasPedersen/mattespill
9209670fa6dbf155bfa578d64f8147dd84fe52a8
Removed redundant else.
diff --git a/main/views.py b/main/views.py index 057d8b4..0b1c6e5 100644 --- a/main/views.py +++ b/main/views.py @@ -1,252 +1,248 @@ # -*- coding: utf-8 -*- from django.template import RequestContext, Context, loader from django.utils import simplejson from django.http import HttpResponse, HttpResponseRedirect, H...
ThomasPedersen/mattespill
8ffeb2712eb3d7c91334308b9e5b9c07871477d6
Fixed title of submit button.
diff --git a/main/templates/signup.html b/main/templates/signup.html index e72d1f7..9c4b7e7 100644 --- a/main/templates/signup.html +++ b/main/templates/signup.html @@ -1,18 +1,18 @@ {% extends "outer.html" %} {% block content %} <h1>Registrer bruker</h1> {{ form.username.errors }} {% if error %} ...
ThomasPedersen/mattespill
a4511979451fc65f055bc32672cb039d1abec8fe
fixed another signup bug
diff --git a/main/templates/signup.html b/main/templates/signup.html index 1875014..e72d1f7 100644 --- a/main/templates/signup.html +++ b/main/templates/signup.html @@ -1,25 +1,18 @@ {% extends "outer.html" %} -{% block head %} - -{% endblock %} - {% block content %} -{% if user.username %} -<h1>Allerede lo...
ThomasPedersen/mattespill
e5438460afa821c765d40a59c70d2f2f128422cc
fixed signup bug
diff --git a/main/views.py b/main/views.py index e351df4..057d8b4 100644 --- a/main/views.py +++ b/main/views.py @@ -1,252 +1,252 @@ # -*- coding: utf-8 -*- from django.template import RequestContext, Context, loader from django.utils import simplejson from django.http import HttpResponse, HttpResponseRedirect, H...
ThomasPedersen/mattespill
9bdd231d338253fcff9a680cfb1b14b84bb9e8b4
Added signup link to manage page.
diff --git a/main/media/main.css b/main/media/main.css index 27c2144..632a447 100644 --- a/main/media/main.css +++ b/main/media/main.css @@ -1,172 +1,176 @@ @font-face { font-family: Aller; font-weight: normal; src: url('fonts/Aller_Rg.ttf'); } @font-face { font-family: Aller; font-weight: bold; src: url...
ThomasPedersen/mattespill
c74eab19012e4e081b78e569b40072462d6bd925
signup done
diff --git a/main/forms.py b/main/forms.py index 6e6ff31..7faa468 100644 --- a/main/forms.py +++ b/main/forms.py @@ -1,37 +1,45 @@ -from django.contrib.auth.models import User +from django.contrib.auth.models import User, Group from django import forms +default_errors = { + 'required': 'This field is required', +...
ThomasPedersen/mattespill
78faf2470e3afcd0dee67c2f24883138383aef01
Removed signup link from login page.
diff --git a/main/templates/registration/login.html b/main/templates/registration/login.html index 6dd0560..465d0c5 100644 --- a/main/templates/registration/login.html +++ b/main/templates/registration/login.html @@ -1,46 +1,45 @@ {% extends "outer.html" %} {% block head %} <style type="text/css"> .error_box { ...
ThomasPedersen/mattespill
5de8608c0543961907db6860a7bd4c6e2e13aec0
Fixed so the whole div is a link, removed some soft tabs and fixed some Norwegian characters.
diff --git a/main/templates/home.html b/main/templates/home.html index 88e063d..204e5f9 100644 --- a/main/templates/home.html +++ b/main/templates/home.html @@ -1,134 +1,135 @@ {% extends "outer.html" %} {% block head %} <script src="/media/home.js" type="text/javascript"></script> <script src="/media/peekbear.js...
ThomasPedersen/mattespill
16bf816261355ca5a96d3f3c56ac4b29e10dcc19
Change bgcolor for current user in top 10 list.
diff --git a/main/templates/stats.html b/main/templates/stats.html index 0cc92f8..6eb1158 100644 --- a/main/templates/stats.html +++ b/main/templates/stats.html @@ -1,32 +1,35 @@ {% extends "outer.html" %} {% block head %} <style type="text/css"> table tr.most_points td { background-color: #aaffaa !important; ...
ThomasPedersen/mattespill
ab55f103d2905aba48e79a805b98a6c0f60ef9f5
Added tests for newgame and answer views.
diff --git a/main/tests.py b/main/tests.py index 59c499e..fea58f6 100644 --- a/main/tests.py +++ b/main/tests.py @@ -1,68 +1,98 @@ from django.test import TestCase from django.test.client import Client -from main.models import Turn +from main.models import Turn, UserProfile from json import loads class ViewsTest...
ThomasPedersen/mattespill
f83a1e2663b08788dcfe0076b7f15e1ee7482efb
Added server side validation of answers (only negative and positive integers)
diff --git a/main/views.py b/main/views.py index 16b8df6..f7907ff 100644 --- a/main/views.py +++ b/main/views.py @@ -1,240 +1,246 @@ # -*- coding: utf-8 -*- from django.template import RequestContext, Context, loader from django.utils import simplejson from django.http import HttpResponse, HttpResponseRedirect, H...
ThomasPedersen/mattespill
7f46572f963a83ca3679efa9be4363e46ab2dec7
Added client side validation of input (only accepts negative and positive integers now)
diff --git a/main/media/question.css b/main/media/question.css index d766d89..9d174a7 100644 --- a/main/media/question.css +++ b/main/media/question.css @@ -1,71 +1,71 @@ #correct_answer { background-color: #afa; } #wrong_answer { background-color: #fcc; } -#empty_answer { +#invalid_answer { background-color:...
ThomasPedersen/mattespill
25babc334e8a22bf1fc6a37e24c8dea178e97eea
forgot new files
diff --git a/main/media/player_mp3_js.swf b/main/media/player_mp3_js.swf new file mode 100644 index 0000000..72390d4 Binary files /dev/null and b/main/media/player_mp3_js.swf differ diff --git a/main/media/sounds/sad_trombone.mp3 b/main/media/sounds/sad_trombone.mp3 new file mode 100644 index 0000000..bf424db Binary fi...
ThomasPedersen/mattespill
3cec18cabaef0ce63e068a039b409cf6980738c2
sounds
diff --git a/main/media/main.js b/main/media/main.js index f4b1bba..3e9dc85 100644 --- a/main/media/main.js +++ b/main/media/main.js @@ -1,24 +1,38 @@ +var soundListener = new Object(); + +soundListener.onInit = function() {}; +soundListener.onUpdate = function() {}; + function getWindowWidth() { if (window.innerWid...
ThomasPedersen/mattespill
6757018ff2f44aca5cfbbb3ac5ec934640b7b62f
signupfix
diff --git a/main/media/main.css b/main/media/main.css index 1632658..27c2144 100644 --- a/main/media/main.css +++ b/main/media/main.css @@ -1,170 +1,172 @@ @font-face { font-family: Aller; font-weight: normal; src: url('fonts/Aller_Rg.ttf'); } @font-face { font-family: Aller; font-weight: bold; src: url...
ThomasPedersen/mattespill
289764cb973285ea489b2629df952c745fe508f5
Changed button title for top players.
diff --git a/main/templates/home.html b/main/templates/home.html index c3f1588..88e063d 100644 --- a/main/templates/home.html +++ b/main/templates/home.html @@ -1,134 +1,134 @@ {% extends "outer.html" %} {% block head %} <script src="/media/home.js" type="text/javascript"></script> <script src="/media/peekbear.js...
ThomasPedersen/mattespill
ce9717f8d543bdc7ea9b0de627eead273a6b403f
Added link to registration form.
diff --git a/main/templates/registration/login.html b/main/templates/registration/login.html index bc4cab4..3dcd290 100644 --- a/main/templates/registration/login.html +++ b/main/templates/registration/login.html @@ -1,46 +1,46 @@ {% extends "outer.html" %} {% block head %} <style type="text/css"> .error_box { ...
ThomasPedersen/mattespill
91210135e47e322f0a82c38393798757de9d8634
ignore
diff --git a/.gitignore b/.gitignore index 9421c62..3c96980 100644 --- a/.gitignore +++ b/.gitignore @@ -1,12 +1,14 @@ *.[oa] *~ *.py[oc] *.swp *.log *.bak *.sqlite .project .pydevproject django-extensions-0.4.1 html .settings +/vpproject +/vpproject
ThomasPedersen/mattespill
f559fb2e2ba36eccac54dbb74c0fa5896536b2c0
signup
diff --git a/main/templates/signup.html b/main/templates/signup.html index 0e63baa..26e2085 100644 --- a/main/templates/signup.html +++ b/main/templates/signup.html @@ -1,13 +1,22 @@ {% extends "outer.html" %} + +{% block head %} +<style type="text/css"> +label { + display: block; +} +</style> +{% endblock %} ...
ThomasPedersen/mattespill
25f086589ac56f8581aeea9e1820413e010a9114
Fade in message instead of using alert on empty answer.
diff --git a/main/media/question.css b/main/media/question.css index 9645eeb..b7e0fff 100644 --- a/main/media/question.css +++ b/main/media/question.css @@ -1,68 +1,71 @@ #correct_answer { background-color: #afa; } #wrong_answer { background-color: #fcc; } -#correct_answer, #wrong_answer { +#empty_answer { + ba...
ThomasPedersen/mattespill
289198bb28d0c2981c4a948f098650c02877d2eb
Added link to main page.
diff --git a/main/templates/manage.html b/main/templates/manage.html index 3e51a78..f2cf622 100644 --- a/main/templates/manage.html +++ b/main/templates/manage.html @@ -1,6 +1,7 @@ {% extends "outer.html" %} {% block content %} <h1>Administrasjon</h1> <p><a href="/groupstats/">Vis resultater for alle gruppene</a...
ThomasPedersen/mattespill
8c8775dd502837783c0b08c00ed179648ff7d59d
Display the amount of points earned or lost for each question.
diff --git a/main/media/question.js b/main/media/question.js index b7106a6..93d87db 100644 --- a/main/media/question.js +++ b/main/media/question.js @@ -1,125 +1,127 @@ var bearTimer; var expireTimer; function nl2br(str) { return (str + '').replace(/([^>\r\n]?)(\r\n|\n\r|\r|\n)/g, '$1' + '<br />' + '$2'); } ...
ThomasPedersen/mattespill
f390025a684a7312281cf8ffcb621716efbfaa52
Fixed order by group name.
diff --git a/main/templates/stats_grouped.html b/main/templates/stats_grouped.html index c14ac15..2c92f59 100644 --- a/main/templates/stats_grouped.html +++ b/main/templates/stats_grouped.html @@ -1,35 +1,35 @@ {% extends "outer.html" %} {% block head %} <style type="text/css"> table tr.most_points td { backgro...
ThomasPedersen/mattespill
9ee22b89a1936551440720b238aa555809ef55b7
login error
diff --git a/main/media/main.css b/main/media/main.css index 436394e..1632658 100644 --- a/main/media/main.css +++ b/main/media/main.css @@ -1,167 +1,170 @@ @font-face { font-family: Aller; font-weight: normal; src: url('fonts/Aller_Rg.ttf'); } @font-face { font-family: Aller; font-weight: bold; src: url...
ThomasPedersen/mattespill
b4fba48564c5b874a1a1dd22520572e62971be13
Added link to standard django admin.
diff --git a/initial_data.json b/initial_data.json index 0270502..bffd14a 100644 --- a/initial_data.json +++ b/initial_data.json @@ -1 +1 @@ -[{"pk": 22, "model": "auth.permission", "fields": {"codename": "add_logentry", "name": "Can add log entry", "content_type": 8}}, {"pk": 23, "model": "auth.permission", "fields": ...
ThomasPedersen/mattespill
088102e8e2675250f0b0ce19671fcbf8e02eab8a
Fucking syncdb.
diff --git a/initial_data.json b/initial_data.json index e05542b..0270502 100644 --- a/initial_data.json +++ b/initial_data.json @@ -1 +1 @@ -[{"pk": 22, "model": "auth.permission", "fields": {"codename": "add_logentry", "name": "Can add log entry", "content_type": 8}}, {"pk": 23, "model": "auth.permission", "fields": ...
ThomasPedersen/mattespill
2aaa344c8148b9f34043d810e927b258dfb9d259
hints!
diff --git a/initial_data.json b/initial_data.json index 249510e..e05542b 100644 --- a/initial_data.json +++ b/initial_data.json @@ -1 +1 @@ -[{"pk": 22, "model": "auth.permission", "fields": {"codename": "add_logentry", "name": "Can add log entry", "content_type": 8}}, {"pk": 23, "model": "auth.permission", "fields": ...
ThomasPedersen/mattespill
bb6ccf336ccdf6556f29b6153dab520e85a5af0e
Added link to groupstats in manage template.
diff --git a/main/templates/manage.html b/main/templates/manage.html index e0ee68c..57718af 100644 --- a/main/templates/manage.html +++ b/main/templates/manage.html @@ -1,4 +1,5 @@ {% extends "outer.html" %} {% block content %} -<h1>Manage</h1> +<h1>Administrasjon</h1> +<p><a href="/groupstats/">Vis resultater f...
ThomasPedersen/mattespill
10daab969a23024e244f0469142bcb5ce9872ef2
Some users didn't have a group.
diff --git a/initial_data.json b/initial_data.json index 494cddb..249510e 100644 --- a/initial_data.json +++ b/initial_data.json @@ -1 +1 @@ -[{"pk": 22, "model": "auth.permission", "fields": {"codename": "add_logentry", "name": "Can add log entry", "content_type": 8}}, {"pk": 23, "model": "auth.permission", "fields": ...
ThomasPedersen/mattespill
5b03b885663f66398ee10de51bb885e3e39df415
Include user in groupstats view.
diff --git a/main/views.py b/main/views.py index cb31332..2a226cf 100644 --- a/main/views.py +++ b/main/views.py @@ -1,236 +1,236 @@ # -*- coding: utf-8 -*- from django.template import RequestContext, Context, loader from django.utils import simplejson from django.http import HttpResponse, HttpResponseRedirect, H...
ThomasPedersen/mattespill
42b6b2f8e16c8fe1abdf88a625bc40b0c8681ab8
hint box fix2
diff --git a/main/media/question.css b/main/media/question.css index a04d07d..265c76e 100644 --- a/main/media/question.css +++ b/main/media/question.css @@ -1,67 +1,68 @@ #correct_answer { background-color: #afa; } #wrong_answer { background-color: #fcc; } #correct_answer, #wrong_answer { display: none; pa...
ThomasPedersen/mattespill
0028f5732cf0d1eb55fd30ef176d2c50c118b621
hint box fix
diff --git a/main/media/question.css b/main/media/question.css index 2a0c879..a04d07d 100644 --- a/main/media/question.css +++ b/main/media/question.css @@ -1,65 +1,67 @@ #correct_answer { background-color: #afa; } #wrong_answer { background-color: #fcc; } #correct_answer, #wrong_answer { display: none; pa...
ThomasPedersen/mattespill
4e6c0ef7876013ea4b76493418d77c13d3680e4b
Added groups and some more users.
diff --git a/initial_data.json b/initial_data.json index 5c1a21b..b951110 100644 --- a/initial_data.json +++ b/initial_data.json @@ -1 +1 @@ -[{"pk": 22, "model": "auth.permission", "fields": {"codename": "add_logentry", "name": "Can add log entry", "content_type": 8}}, {"pk": 23, "model": "auth.permission", "fields": ...
ThomasPedersen/mattespill
fec25223c414a3f0fdee6a080ff47811064a9139
newlines in hints fix4
diff --git a/main/media/question.js b/main/media/question.js index 0c1e007..52378b6 100644 --- a/main/media/question.js +++ b/main/media/question.js @@ -1,111 +1,112 @@ var bearTimer; + function nl2br(str) { - return (str + '').replace(/([^>\r\n]?)(\r\n|\n\r|\r|\n)/g, '$1' + breakTag + '$2'); + return (str + '').re...
ThomasPedersen/mattespill
233bc95e2e1c16ecc3db22a9b9c45319f3184a68
Added template for grouped stats.
diff --git a/main/templates/stats_grouped.html b/main/templates/stats_grouped.html new file mode 100644 index 0000000..c14ac15 --- /dev/null +++ b/main/templates/stats_grouped.html @@ -0,0 +1,35 @@ +{% extends "outer.html" %} + +{% block head %} +<style type="text/css"> +table tr.most_points td { + background-color: #a...
ThomasPedersen/mattespill
223baddbd8b3f87d040fcaee26e1d92dca5b7428
Added url for group stats.
diff --git a/urls.py b/urls.py index f92a36a..a8b0130 100644 --- a/urls.py +++ b/urls.py @@ -1,28 +1,29 @@ from django.conf.urls.defaults import * from django.conf import settings # Uncomment the next two lines to enable the admin: from django.contrib import admin admin.autodiscover() urlpatterns = patterns('...
ThomasPedersen/mattespill
bab80c88a2ea8f0ce8faf4fb143a99ae83fc1041
Fix ordering for group stats.
diff --git a/main/views.py b/main/views.py index 56f5c0f..cb31332 100644 --- a/main/views.py +++ b/main/views.py @@ -1,235 +1,236 @@ # -*- coding: utf-8 -*- from django.template import RequestContext, Context, loader from django.utils import simplejson from django.http import HttpResponse, HttpResponseRedirect, H...
ThomasPedersen/mattespill
68ce06b17fb3f3eebda5fa8301aad08a34504fec
Change table background to green for user with most points.
diff --git a/main/templates/stats.html b/main/templates/stats.html index e241ff1..0cc92f8 100644 --- a/main/templates/stats.html +++ b/main/templates/stats.html @@ -1,32 +1,32 @@ {% extends "outer.html" %} {% block head %} <style type="text/css"> table tr.most_points td { - background-color: #aaffaa; + background...
ThomasPedersen/mattespill
ccdf200833c9acbc09d38f3af0cdf8a394b18913
newlines in hints
diff --git a/main/media/peekbear.js b/main/media/peekbear.js index d5bdcd8..f6a14ba 100644 --- a/main/media/peekbear.js +++ b/main/media/peekbear.js @@ -1,57 +1,57 @@ var peekbearImages = ['peekbearbottom.png', 'peekbearright.png', 'peekbearleft.png']; function showPeekbear() { var i = Math.floor(Math.random()*(p...
ThomasPedersen/mattespill
64c85dd56d565112e3f0a8bc3cd0cdc68f6fa85f
more questions!
diff --git a/initial_data.json b/initial_data.json index 5c1a21b..806034d 100644 --- a/initial_data.json +++ b/initial_data.json @@ -1 +1 @@ -[{"pk": 22, "model": "auth.permission", "fields": {"codename": "add_logentry", "name": "Can add log entry", "content_type": 8}}, {"pk": 23, "model": "auth.permission", "fields": ...
ThomasPedersen/mattespill
66646b0211b4457f2c9b463851bce611168c7404
Grouped stats page.
diff --git a/main/views.py b/main/views.py index fa5091c..56f5c0f 100644 --- a/main/views.py +++ b/main/views.py @@ -1,222 +1,235 @@ # -*- coding: utf-8 -*- from django.template import RequestContext, Context, loader from django.utils import simplejson from django.http import HttpResponse, HttpResponseRedirect, H...
ThomasPedersen/mattespill
303e3be5bfc4cd7bd0e183a43bcd553012b09c21
Stubs for missing tests.
diff --git a/main/tests.py b/main/tests.py index d9cc436..59c499e 100644 --- a/main/tests.py +++ b/main/tests.py @@ -1,59 +1,68 @@ from django.test import TestCase from django.test.client import Client from main.models import Turn from json import loads class ViewsTest(TestCase): def test_login(self): + # ...
ThomasPedersen/mattespill
c3ecca2aca415c31a70c77d0921dd30d2a3cd055
Check if user is authenticated in all views.
diff --git a/main/views.py b/main/views.py index 4fe4d16..fa5091c 100644 --- a/main/views.py +++ b/main/views.py @@ -1,215 +1,222 @@ # -*- coding: utf-8 -*- from django.template import RequestContext, Context, loader from django.utils import simplejson from django.http import HttpResponse, HttpResponseRedirect, H...
ThomasPedersen/mattespill
ea8d4e6c9f1c0674ffcb865059cef52b2d9cc046
Fixed the placement of the gold coin for normal users in outer.html
diff --git a/main/media/main.css b/main/media/main.css index f402720..436394e 100644 --- a/main/media/main.css +++ b/main/media/main.css @@ -1,166 +1,167 @@ @font-face { font-family: Aller; font-weight: normal; src: url('fonts/Aller_Rg.ttf'); } @font-face { font-family: Aller; font-weight: bold; src: url...
ThomasPedersen/mattespill
93295b18afb61840eb6119bf5cdacf2a9d7309b7
mange nye oppgaver!
diff --git a/initial_data.json b/initial_data.json index e1e2c28..5c1a21b 100644 --- a/initial_data.json +++ b/initial_data.json @@ -1 +1 @@ -[{"pk": 22, "model": "auth.permission", "fields": {"codename": "add_logentry", "name": "Can add log entry", "content_type": 8}}, {"pk": 23, "model": "auth.permission", "fields": ...
ThomasPedersen/mattespill
fa789b1b884c8ea3e5e68a94792e4818305aa022
game over bug
diff --git a/main/media/question.js b/main/media/question.js index e53db8b..1782c28 100644 --- a/main/media/question.js +++ b/main/media/question.js @@ -1,105 +1,106 @@ var bearTimer; function showBear() { $('#hintbear').css('cursor', 'pointer').click(function() { $.ajax({ type: 'POST', url: '/buyhint/...
ThomasPedersen/mattespill
b5f117294316c2b422b70a43451d0d0aa285a8bf
Include user when rendering game_over template.
diff --git a/main/views.py b/main/views.py index 9ec27e1..4fe4d16 100644 --- a/main/views.py +++ b/main/views.py @@ -1,216 +1,215 @@ # -*- coding: utf-8 -*- from django.template import RequestContext, Context, loader from django.utils import simplejson from django.http import HttpResponse, HttpResponseRedirect, H...
ThomasPedersen/mattespill
843767fd65aec563c80a2c4f411742673296b336
forgot git add
diff --git a/main/media/images/sad_bear.png b/main/media/images/sad_bear.png new file mode 100644 index 0000000..4f4f15c Binary files /dev/null and b/main/media/images/sad_bear.png differ diff --git a/main/templates/game_over.html b/main/templates/game_over.html new file mode 100644 index 0000000..c1b182d --- /dev/null...
ThomasPedersen/mattespill
eb259305c2cb57bbf8e0bad010d047bd5a2d49a1
Game over
diff --git a/main/media/main.css b/main/media/main.css index f986169..00504ec 100644 --- a/main/media/main.css +++ b/main/media/main.css @@ -1,167 +1,166 @@ @font-face { font-family: Aller; font-weight: normal; src: url('fonts/Aller_Rg.ttf'); } @font-face { font-family: Aller; font-weight: bold; src: url...
ThomasPedersen/mattespill
d3114a6704f42d86598984b0d0a0807ef4e32793
Check game over in index. Fixed answer view.
diff --git a/main/views.py b/main/views.py index b33dd73..2d7728a 100644 --- a/main/views.py +++ b/main/views.py @@ -1,207 +1,210 @@ # -*- coding: utf-8 -*- from django.template import RequestContext, Context, loader from django.utils import simplejson from django.http import HttpResponse, HttpResponseRedirect, H...
ThomasPedersen/mattespill
21e29b723837d002cc8d640dca1b110d4f88bf0d
Avoid setting profile points to a negative number.
diff --git a/main/views.py b/main/views.py index af9f182..b33dd73 100644 --- a/main/views.py +++ b/main/views.py @@ -1,203 +1,207 @@ # -*- coding: utf-8 -*- from django.template import RequestContext, Context, loader from django.utils import simplejson from django.http import HttpResponse, HttpResponseRedirect, H...
ThomasPedersen/mattespill
3b78bceaf62458472121d0785c2a6725d5627471
Added an admin option on the header
diff --git a/main/media/main.css b/main/media/main.css index f986169..a4952dc 100644 --- a/main/media/main.css +++ b/main/media/main.css @@ -1,167 +1,167 @@ @font-face { font-family: Aller; font-weight: normal; src: url('fonts/Aller_Rg.ttf'); } @font-face { font-family: Aller; font-weight: bold; src: url...
ThomasPedersen/mattespill
b23531e19f7a9511655c62edffa9910ddc145350
URL for newgame view.
diff --git a/urls.py b/urls.py index b76ab1c..8bc6777 100644 --- a/urls.py +++ b/urls.py @@ -1,25 +1,26 @@ from django.conf.urls.defaults import * from django.conf import settings # Uncomment the next two lines to enable the admin: from django.contrib import admin admin.autodiscover() urlpatterns = patterns('...
ThomasPedersen/mattespill
c98dcef1335c17ac3104265fdb5c55f3ec52da88
Added is_gameover method to UserProfile model. Added view for new game.
diff --git a/main/models.py b/main/models.py index 78ad080..c212592 100644 --- a/main/models.py +++ b/main/models.py @@ -1,73 +1,76 @@ from django.db import models from django.contrib.auth.models import User from django.db.models.signals import post_save class UserProfile(models.Model): '''Class defining the U...
ThomasPedersen/mattespill
ceb2ad9a3d2817d578f66dea190d1fc7ff938e41
Fixed unindented docstring.
diff --git a/main/models.py b/main/models.py index 417cb04..78ad080 100644 --- a/main/models.py +++ b/main/models.py @@ -1,73 +1,73 @@ from django.db import models from django.contrib.auth.models import User from django.db.models.signals import post_save class UserProfile(models.Model): '''Class defining the U...
ThomasPedersen/mattespill
910c4910f47ecd8fffdea6e4b8b7ea7703e7fd9f
Added test for buyhint view.
diff --git a/main/tests.py b/main/tests.py index 0cb6bb8..d9cc436 100644 --- a/main/tests.py +++ b/main/tests.py @@ -1,44 +1,59 @@ from django.test import TestCase from django.test.client import Client from main.models import Turn +from json import loads class ViewsTest(TestCase): def test_login(self): re...
ThomasPedersen/mattespill
4aa37ee0f4c0ef2ce4230c1abb50b98476654e08
Cover all possible paths in buyhint view.
diff --git a/main/views.py b/main/views.py index 8f5efb7..6aff6a4 100644 --- a/main/views.py +++ b/main/views.py @@ -1,170 +1,172 @@ # -*- coding: utf-8 -*- from django.template import RequestContext, Context, loader from django.utils import simplejson from django.http import HttpResponse, HttpResponseRedirect, H...
ThomasPedersen/mattespill
b1f3b22a14021691106a4eea0a6f67bb978ca794
Start writing docstrings, everybody
diff --git a/README b/README index 31e66dd..be83088 100644 --- a/README +++ b/README @@ -1,19 +1,23 @@ +Begynn å skrive docstrings! + +http://epydoc.sourceforge.net/epytext.html + For å sette navn og mail på innsjekingene: git config --global user.name "Tekkub" git config --global user.email "tekkub@gmail.com" ...
ThomasPedersen/mattespill
43f805a05288068cfc03b92a555957d958170513
Cleanup folders\!
diff --git a/.gitignore b/.gitignore index 8b115e1..9421c62 100644 --- a/.gitignore +++ b/.gitignore @@ -1,11 +1,12 @@ *.[oa] *~ *.py[oc] *.swp *.log *.bak *.sqlite .project .pydevproject django-extensions-0.4.1 html +.settings diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.c...
ThomasPedersen/mattespill
540a92591675d621073cc2ddadd9f50b081d898e
First docstrings added. Start commenting!
diff --git a/main/admin.py b/main/admin.py index e692f42..a31f87a 100644 --- a/main/admin.py +++ b/main/admin.py @@ -1,13 +1,17 @@ from mattespill.main.models import Question, Room, Turn, Result, UserProfile, Hint from django.contrib import admin class QuestionAdmin(admin.ModelAdmin): + ''' + Django class for de...