diff options
Diffstat (limited to 'forum/skins/default')
171 files changed, 409 insertions, 4 deletions
diff --git a/forum/skins/default/media/images/blue-up-arrow-h18px.png b/forum/skins/default/media/images/blue-up-arrow-h18px.png Binary files differindex e1f29e86..e1f29e86 100644..100755 --- a/forum/skins/default/media/images/blue-up-arrow-h18px.png +++ b/forum/skins/default/media/images/blue-up-arrow-h18px.png diff --git a/forum/skins/default/media/images/box-arrow.gif b/forum/skins/default/media/images/box-arrow.gif Binary files differindex 89dcf5b3..89dcf5b3 100644..100755 --- a/forum/skins/default/media/images/box-arrow.gif +++ b/forum/skins/default/media/images/box-arrow.gif diff --git a/forum/skins/default/media/images/bullet_green.gif b/forum/skins/default/media/images/bullet_green.gif Binary files differindex fa530910..fa530910 100644..100755 --- a/forum/skins/default/media/images/bullet_green.gif +++ b/forum/skins/default/media/images/bullet_green.gif diff --git a/forum/skins/default/media/images/cc-88x31.png b/forum/skins/default/media/images/cc-88x31.png Binary files differindex 0f2a0f10..0f2a0f10 100644..100755 --- a/forum/skins/default/media/images/cc-88x31.png +++ b/forum/skins/default/media/images/cc-88x31.png diff --git a/forum/skins/default/media/images/cc-wiki.png b/forum/skins/default/media/images/cc-wiki.png Binary files differindex 3e680538..3e680538 100644..100755 --- a/forum/skins/default/media/images/cc-wiki.png +++ b/forum/skins/default/media/images/cc-wiki.png diff --git a/forum/skins/default/media/images/close-small-dark.png b/forum/skins/default/media/images/close-small-dark.png Binary files differindex 280c1fc7..280c1fc7 100644..100755 --- a/forum/skins/default/media/images/close-small-dark.png +++ b/forum/skins/default/media/images/close-small-dark.png diff --git a/forum/skins/default/media/images/close-small-hover.png b/forum/skins/default/media/images/close-small-hover.png Binary files differindex 7899aec7..7899aec7 100644..100755 --- a/forum/skins/default/media/images/close-small-hover.png +++ b/forum/skins/default/media/images/close-small-hover.png diff --git a/forum/skins/default/media/images/close-small.png b/forum/skins/default/media/images/close-small.png Binary files differindex 5a99d31f..5a99d31f 100644..100755 --- a/forum/skins/default/media/images/close-small.png +++ b/forum/skins/default/media/images/close-small.png diff --git a/forum/skins/default/media/images/dash.gif b/forum/skins/default/media/images/dash.gif Binary files differindex d1ddc507..d1ddc507 100644..100755 --- a/forum/skins/default/media/images/dash.gif +++ b/forum/skins/default/media/images/dash.gif diff --git a/forum/skins/default/media/images/djangomade124x25_grey.gif b/forum/skins/default/media/images/djangomade124x25_grey.gif Binary files differindex d34bb311..d34bb311 100644..100755 --- a/forum/skins/default/media/images/djangomade124x25_grey.gif +++ b/forum/skins/default/media/images/djangomade124x25_grey.gif diff --git a/forum/skins/default/media/images/dot-g.gif b/forum/skins/default/media/images/dot-g.gif Binary files differindex 5d6bb28e..5d6bb28e 100644..100755 --- a/forum/skins/default/media/images/dot-g.gif +++ b/forum/skins/default/media/images/dot-g.gif diff --git a/forum/skins/default/media/images/dot-list.gif b/forum/skins/default/media/images/dot-list.gif Binary files differindex f6a6b865..f6a6b865 100644..100755 --- a/forum/skins/default/media/images/dot-list.gif +++ b/forum/skins/default/media/images/dot-list.gif diff --git a/forum/skins/default/media/images/edit.png b/forum/skins/default/media/images/edit.png Binary files differindex dcb09be0..dcb09be0 100644..100755 --- a/forum/skins/default/media/images/edit.png +++ b/forum/skins/default/media/images/edit.png diff --git a/forum/skins/default/media/images/expander-arrow-hide.gif b/forum/skins/default/media/images/expander-arrow-hide.gif Binary files differindex feb6a618..feb6a618 100644..100755 --- a/forum/skins/default/media/images/expander-arrow-hide.gif +++ b/forum/skins/default/media/images/expander-arrow-hide.gif diff --git a/forum/skins/default/media/images/expander-arrow-show.gif b/forum/skins/default/media/images/expander-arrow-show.gif Binary files differindex 6825c56e..6825c56e 100644..100755 --- a/forum/skins/default/media/images/expander-arrow-show.gif +++ b/forum/skins/default/media/images/expander-arrow-show.gif diff --git a/forum/skins/default/media/images/favicon.gif b/forum/skins/default/media/images/favicon.gif Binary files differindex 910c2666..910c2666 100644..100755 --- a/forum/skins/default/media/images/favicon.gif +++ b/forum/skins/default/media/images/favicon.gif diff --git a/forum/skins/default/media/images/feed-icon-small.png b/forum/skins/default/media/images/feed-icon-small.png Binary files differindex b3c949d2..b3c949d2 100644..100755 --- a/forum/skins/default/media/images/feed-icon-small.png +++ b/forum/skins/default/media/images/feed-icon-small.png diff --git a/forum/skins/default/media/images/gray-up-arrow-h18px.png b/forum/skins/default/media/images/gray-up-arrow-h18px.png Binary files differindex 78767445..78767445 100644..100755 --- a/forum/skins/default/media/images/gray-up-arrow-h18px.png +++ b/forum/skins/default/media/images/gray-up-arrow-h18px.png diff --git a/forum/skins/default/media/images/grippie.png b/forum/skins/default/media/images/grippie.png Binary files differindex 6524d416..6524d416 100644..100755 --- a/forum/skins/default/media/images/grippie.png +++ b/forum/skins/default/media/images/grippie.png diff --git a/forum/skins/default/media/images/indicator.gif b/forum/skins/default/media/images/indicator.gif Binary files differindex 1c72ebb5..1c72ebb5 100644..100755 --- a/forum/skins/default/media/images/indicator.gif +++ b/forum/skins/default/media/images/indicator.gif diff --git a/forum/skins/default/media/images/logo.gif b/forum/skins/default/media/images/logo.gif Binary files differindex ab690de2..ab690de2 100644..100755 --- a/forum/skins/default/media/images/logo.gif +++ b/forum/skins/default/media/images/logo.gif diff --git a/forum/skins/default/media/images/logo.png b/forum/skins/default/media/images/logo.png Binary files differindex 6a250e35..6a250e35 100644..100755 --- a/forum/skins/default/media/images/logo.png +++ b/forum/skins/default/media/images/logo.png diff --git a/forum/skins/default/media/images/logo1.png b/forum/skins/default/media/images/logo1.png Binary files differindex d79a6271..d79a6271 100644..100755 --- a/forum/skins/default/media/images/logo1.png +++ b/forum/skins/default/media/images/logo1.png diff --git a/forum/skins/default/media/images/logo2.png b/forum/skins/default/media/images/logo2.png Binary files differindex bd3cccd9..bd3cccd9 100644..100755 --- a/forum/skins/default/media/images/logo2.png +++ b/forum/skins/default/media/images/logo2.png diff --git a/forum/skins/default/media/images/medala.gif b/forum/skins/default/media/images/medala.gif Binary files differindex 93dd1a39..93dd1a39 100644..100755 --- a/forum/skins/default/media/images/medala.gif +++ b/forum/skins/default/media/images/medala.gif diff --git a/forum/skins/default/media/images/medala_on.gif b/forum/skins/default/media/images/medala_on.gif Binary files differindex a18f9e85..a18f9e85 100644..100755 --- a/forum/skins/default/media/images/medala_on.gif +++ b/forum/skins/default/media/images/medala_on.gif diff --git a/forum/skins/default/media/images/new.gif b/forum/skins/default/media/images/new.gif Binary files differindex 8a220b53..8a220b53 100644..100755 --- a/forum/skins/default/media/images/new.gif +++ b/forum/skins/default/media/images/new.gif diff --git a/forum/skins/default/media/images/nophoto.png b/forum/skins/default/media/images/nophoto.png Binary files differindex 2daf0ffd..2daf0ffd 100644..100755 --- a/forum/skins/default/media/images/nophoto.png +++ b/forum/skins/default/media/images/nophoto.png diff --git a/forum/skins/default/media/images/openid.gif b/forum/skins/default/media/images/openid.gif Binary files differindex 8540e12b..8540e12b 100644..100755 --- a/forum/skins/default/media/images/openid.gif +++ b/forum/skins/default/media/images/openid.gif diff --git a/forum/skins/default/media/images/openid/aol.gif b/forum/skins/default/media/images/openid/aol.gif Binary files differindex decc4f12..decc4f12 100644..100755 --- a/forum/skins/default/media/images/openid/aol.gif +++ b/forum/skins/default/media/images/openid/aol.gif diff --git a/forum/skins/default/media/images/openid/blogger.ico b/forum/skins/default/media/images/openid/blogger.ico Binary files differindex 1b9730b0..1b9730b0 100644..100755 --- a/forum/skins/default/media/images/openid/blogger.ico +++ b/forum/skins/default/media/images/openid/blogger.ico diff --git a/forum/skins/default/media/images/openid/claimid.ico b/forum/skins/default/media/images/openid/claimid.ico Binary files differindex 2b80f491..2b80f491 100644..100755 --- a/forum/skins/default/media/images/openid/claimid.ico +++ b/forum/skins/default/media/images/openid/claimid.ico diff --git a/forum/skins/default/media/images/openid/facebook.gif b/forum/skins/default/media/images/openid/facebook.gif Binary files differindex b997b358..b997b358 100644..100755 --- a/forum/skins/default/media/images/openid/facebook.gif +++ b/forum/skins/default/media/images/openid/facebook.gif diff --git a/forum/skins/default/media/images/openid/flickr.ico b/forum/skins/default/media/images/openid/flickr.ico Binary files differindex 11f6e07f..11f6e07f 100644..100755 --- a/forum/skins/default/media/images/openid/flickr.ico +++ b/forum/skins/default/media/images/openid/flickr.ico diff --git a/forum/skins/default/media/images/openid/google.gif b/forum/skins/default/media/images/openid/google.gif Binary files differindex 1b6cd07b..1b6cd07b 100644..100755 --- a/forum/skins/default/media/images/openid/google.gif +++ b/forum/skins/default/media/images/openid/google.gif diff --git a/forum/skins/default/media/images/openid/livejournal.ico b/forum/skins/default/media/images/openid/livejournal.ico Binary files differindex f3d21ec5..f3d21ec5 100644..100755 --- a/forum/skins/default/media/images/openid/livejournal.ico +++ b/forum/skins/default/media/images/openid/livejournal.ico diff --git a/forum/skins/default/media/images/openid/myopenid.ico b/forum/skins/default/media/images/openid/myopenid.ico Binary files differindex ceb06e6a..ceb06e6a 100644..100755 --- a/forum/skins/default/media/images/openid/myopenid.ico +++ b/forum/skins/default/media/images/openid/myopenid.ico diff --git a/forum/skins/default/media/images/openid/openid-inputicon.gif b/forum/skins/default/media/images/openid/openid-inputicon.gif Binary files differindex cde836c8..cde836c8 100644..100755 --- a/forum/skins/default/media/images/openid/openid-inputicon.gif +++ b/forum/skins/default/media/images/openid/openid-inputicon.gif diff --git a/forum/skins/default/media/images/openid/openid.gif b/forum/skins/default/media/images/openid/openid.gif Binary files differindex c718b0e6..c718b0e6 100644..100755 --- a/forum/skins/default/media/images/openid/openid.gif +++ b/forum/skins/default/media/images/openid/openid.gif diff --git a/forum/skins/default/media/images/openid/technorati.ico b/forum/skins/default/media/images/openid/technorati.ico Binary files differindex fa1083c1..fa1083c1 100644..100755 --- a/forum/skins/default/media/images/openid/technorati.ico +++ b/forum/skins/default/media/images/openid/technorati.ico diff --git a/forum/skins/default/media/images/openid/twitter.png b/forum/skins/default/media/images/openid/twitter.png Binary files differnew file mode 100755 index 00000000..9a6552d1 --- /dev/null +++ b/forum/skins/default/media/images/openid/twitter.png diff --git a/forum/skins/default/media/images/openid/verisign.ico b/forum/skins/default/media/images/openid/verisign.ico Binary files differindex 3953af93..3953af93 100644..100755 --- a/forum/skins/default/media/images/openid/verisign.ico +++ b/forum/skins/default/media/images/openid/verisign.ico diff --git a/forum/skins/default/media/images/openid/vidoop.ico b/forum/skins/default/media/images/openid/vidoop.ico Binary files differindex bbd9a0d5..bbd9a0d5 100644..100755 --- a/forum/skins/default/media/images/openid/vidoop.ico +++ b/forum/skins/default/media/images/openid/vidoop.ico diff --git a/forum/skins/default/media/images/openid/wordpress.ico b/forum/skins/default/media/images/openid/wordpress.ico Binary files differindex 31b7d2c2..31b7d2c2 100644..100755 --- a/forum/skins/default/media/images/openid/wordpress.ico +++ b/forum/skins/default/media/images/openid/wordpress.ico diff --git a/forum/skins/default/media/images/openid/yahoo.gif b/forum/skins/default/media/images/openid/yahoo.gif Binary files differindex 42adbfa5..0f0eb8ef 100644..100755 --- a/forum/skins/default/media/images/openid/yahoo.gif +++ b/forum/skins/default/media/images/openid/yahoo.gif diff --git a/forum/skins/default/media/images/quest-bg.gif b/forum/skins/default/media/images/quest-bg.gif Binary files differindex b7540238..b7540238 100644..100755 --- a/forum/skins/default/media/images/quest-bg.gif +++ b/forum/skins/default/media/images/quest-bg.gif diff --git a/forum/skins/default/media/images/vote-accepted-on.png b/forum/skins/default/media/images/vote-accepted-on.png Binary files differindex 2026f3bc..2026f3bc 100644..100755 --- a/forum/skins/default/media/images/vote-accepted-on.png +++ b/forum/skins/default/media/images/vote-accepted-on.png diff --git a/forum/skins/default/media/images/vote-accepted.png b/forum/skins/default/media/images/vote-accepted.png Binary files differindex ecd18551..ecd18551 100644..100755 --- a/forum/skins/default/media/images/vote-accepted.png +++ b/forum/skins/default/media/images/vote-accepted.png diff --git a/forum/skins/default/media/images/vote-arrow-down-on.png b/forum/skins/default/media/images/vote-arrow-down-on.png Binary files differindex 048dbb44..048dbb44 100644..100755 --- a/forum/skins/default/media/images/vote-arrow-down-on.png +++ b/forum/skins/default/media/images/vote-arrow-down-on.png diff --git a/forum/skins/default/media/images/vote-arrow-down.png b/forum/skins/default/media/images/vote-arrow-down.png Binary files differindex e4fdec0a..e4fdec0a 100644..100755 --- a/forum/skins/default/media/images/vote-arrow-down.png +++ b/forum/skins/default/media/images/vote-arrow-down.png diff --git a/forum/skins/default/media/images/vote-arrow-up-on.png b/forum/skins/default/media/images/vote-arrow-up-on.png Binary files differindex 56ad0c25..56ad0c25 100644..100755 --- a/forum/skins/default/media/images/vote-arrow-up-on.png +++ b/forum/skins/default/media/images/vote-arrow-up-on.png diff --git a/forum/skins/default/media/images/vote-arrow-up.png b/forum/skins/default/media/images/vote-arrow-up.png Binary files differindex 6e9a51c7..6e9a51c7 100644..100755 --- a/forum/skins/default/media/images/vote-arrow-up.png +++ b/forum/skins/default/media/images/vote-arrow-up.png diff --git a/forum/skins/default/media/images/vote-favorite-off.png b/forum/skins/default/media/images/vote-favorite-off.png Binary files differindex c1bef074..c1bef074 100644..100755 --- a/forum/skins/default/media/images/vote-favorite-off.png +++ b/forum/skins/default/media/images/vote-favorite-off.png diff --git a/forum/skins/default/media/images/vote-favorite-on.png b/forum/skins/default/media/images/vote-favorite-on.png Binary files differindex 1f9c14ab..1f9c14ab 100644..100755 --- a/forum/skins/default/media/images/vote-favorite-on.png +++ b/forum/skins/default/media/images/vote-favorite-on.png diff --git a/forum/skins/default/media/jquery-openid/images/aol.gif b/forum/skins/default/media/jquery-openid/images/aol.gif Binary files differindex decc4f12..decc4f12 100644..100755 --- a/forum/skins/default/media/jquery-openid/images/aol.gif +++ b/forum/skins/default/media/jquery-openid/images/aol.gif diff --git a/forum/skins/default/media/jquery-openid/images/blogger-1.png b/forum/skins/default/media/jquery-openid/images/blogger-1.png Binary files differindex 8b360ea5..8b360ea5 100644..100755 --- a/forum/skins/default/media/jquery-openid/images/blogger-1.png +++ b/forum/skins/default/media/jquery-openid/images/blogger-1.png diff --git a/forum/skins/default/media/jquery-openid/images/blogger.ico b/forum/skins/default/media/jquery-openid/images/blogger.ico Binary files differindex 1b9730b0..1b9730b0 100644..100755 --- a/forum/skins/default/media/jquery-openid/images/blogger.ico +++ b/forum/skins/default/media/jquery-openid/images/blogger.ico diff --git a/forum/skins/default/media/jquery-openid/images/claimid-0.png b/forum/skins/default/media/jquery-openid/images/claimid-0.png Binary files differindex 4a0ea1b3..4a0ea1b3 100644..100755 --- a/forum/skins/default/media/jquery-openid/images/claimid-0.png +++ b/forum/skins/default/media/jquery-openid/images/claimid-0.png diff --git a/forum/skins/default/media/jquery-openid/images/claimid.ico b/forum/skins/default/media/jquery-openid/images/claimid.ico Binary files differindex 2b80f491..2b80f491 100644..100755 --- a/forum/skins/default/media/jquery-openid/images/claimid.ico +++ b/forum/skins/default/media/jquery-openid/images/claimid.ico diff --git a/forum/skins/default/media/jquery-openid/images/facebook.gif b/forum/skins/default/media/jquery-openid/images/facebook.gif Binary files differindex b997b358..b997b358 100644..100755 --- a/forum/skins/default/media/jquery-openid/images/facebook.gif +++ b/forum/skins/default/media/jquery-openid/images/facebook.gif diff --git a/forum/skins/default/media/jquery-openid/images/flickr.ico b/forum/skins/default/media/jquery-openid/images/flickr.ico Binary files differindex 11f6e07f..11f6e07f 100644..100755 --- a/forum/skins/default/media/jquery-openid/images/flickr.ico +++ b/forum/skins/default/media/jquery-openid/images/flickr.ico diff --git a/forum/skins/default/media/jquery-openid/images/flickr.png b/forum/skins/default/media/jquery-openid/images/flickr.png Binary files differindex 142405a6..142405a6 100644..100755 --- a/forum/skins/default/media/jquery-openid/images/flickr.png +++ b/forum/skins/default/media/jquery-openid/images/flickr.png diff --git a/forum/skins/default/media/jquery-openid/images/google.gif b/forum/skins/default/media/jquery-openid/images/google.gif Binary files differindex 1b6cd07b..1b6cd07b 100644..100755 --- a/forum/skins/default/media/jquery-openid/images/google.gif +++ b/forum/skins/default/media/jquery-openid/images/google.gif diff --git a/forum/skins/default/media/jquery-openid/images/livejournal-1.png b/forum/skins/default/media/jquery-openid/images/livejournal-1.png Binary files differindex e6436081..e6436081 100644..100755 --- a/forum/skins/default/media/jquery-openid/images/livejournal-1.png +++ b/forum/skins/default/media/jquery-openid/images/livejournal-1.png diff --git a/forum/skins/default/media/jquery-openid/images/livejournal.ico b/forum/skins/default/media/jquery-openid/images/livejournal.ico Binary files differindex f3d21ec5..f3d21ec5 100644..100755 --- a/forum/skins/default/media/jquery-openid/images/livejournal.ico +++ b/forum/skins/default/media/jquery-openid/images/livejournal.ico diff --git a/forum/skins/default/media/jquery-openid/images/myopenid-2.png b/forum/skins/default/media/jquery-openid/images/myopenid-2.png Binary files differindex f64fb8e8..f64fb8e8 100644..100755 --- a/forum/skins/default/media/jquery-openid/images/myopenid-2.png +++ b/forum/skins/default/media/jquery-openid/images/myopenid-2.png diff --git a/forum/skins/default/media/jquery-openid/images/myopenid.ico b/forum/skins/default/media/jquery-openid/images/myopenid.ico Binary files differindex ceb06e6a..ceb06e6a 100644..100755 --- a/forum/skins/default/media/jquery-openid/images/myopenid.ico +++ b/forum/skins/default/media/jquery-openid/images/myopenid.ico diff --git a/forum/skins/default/media/jquery-openid/images/openid-inputicon.gif b/forum/skins/default/media/jquery-openid/images/openid-inputicon.gif Binary files differindex cde836c8..cde836c8 100644..100755 --- a/forum/skins/default/media/jquery-openid/images/openid-inputicon.gif +++ b/forum/skins/default/media/jquery-openid/images/openid-inputicon.gif diff --git a/forum/skins/default/media/jquery-openid/images/openid.gif b/forum/skins/default/media/jquery-openid/images/openid.gif Binary files differindex c718b0e6..c718b0e6 100644..100755 --- a/forum/skins/default/media/jquery-openid/images/openid.gif +++ b/forum/skins/default/media/jquery-openid/images/openid.gif diff --git a/forum/skins/default/media/jquery-openid/images/openidico.png b/forum/skins/default/media/jquery-openid/images/openidico.png Binary files differindex ab622669..ab622669 100644..100755 --- a/forum/skins/default/media/jquery-openid/images/openidico.png +++ b/forum/skins/default/media/jquery-openid/images/openidico.png diff --git a/forum/skins/default/media/jquery-openid/images/openidico16.png b/forum/skins/default/media/jquery-openid/images/openidico16.png Binary files differindex ad718ac5..ad718ac5 100644..100755 --- a/forum/skins/default/media/jquery-openid/images/openidico16.png +++ b/forum/skins/default/media/jquery-openid/images/openidico16.png diff --git a/forum/skins/default/media/jquery-openid/images/technorati-1.png b/forum/skins/default/media/jquery-openid/images/technorati-1.png Binary files differindex f7195240..f7195240 100644..100755 --- a/forum/skins/default/media/jquery-openid/images/technorati-1.png +++ b/forum/skins/default/media/jquery-openid/images/technorati-1.png diff --git a/forum/skins/default/media/jquery-openid/images/technorati.ico b/forum/skins/default/media/jquery-openid/images/technorati.ico Binary files differindex fa1083c1..fa1083c1 100644..100755 --- a/forum/skins/default/media/jquery-openid/images/technorati.ico +++ b/forum/skins/default/media/jquery-openid/images/technorati.ico diff --git a/forum/skins/default/media/jquery-openid/images/verisign-2.png b/forum/skins/default/media/jquery-openid/images/verisign-2.png Binary files differindex c1467008..c1467008 100644..100755 --- a/forum/skins/default/media/jquery-openid/images/verisign-2.png +++ b/forum/skins/default/media/jquery-openid/images/verisign-2.png diff --git a/forum/skins/default/media/jquery-openid/images/verisign.ico b/forum/skins/default/media/jquery-openid/images/verisign.ico Binary files differindex 3953af93..3953af93 100644..100755 --- a/forum/skins/default/media/jquery-openid/images/verisign.ico +++ b/forum/skins/default/media/jquery-openid/images/verisign.ico diff --git a/forum/skins/default/media/jquery-openid/images/vidoop.ico b/forum/skins/default/media/jquery-openid/images/vidoop.ico Binary files differindex bbd9a0d5..bbd9a0d5 100644..100755 --- a/forum/skins/default/media/jquery-openid/images/vidoop.ico +++ b/forum/skins/default/media/jquery-openid/images/vidoop.ico diff --git a/forum/skins/default/media/jquery-openid/images/vidoop.png b/forum/skins/default/media/jquery-openid/images/vidoop.png Binary files differindex 032c9e98..032c9e98 100644..100755 --- a/forum/skins/default/media/jquery-openid/images/vidoop.png +++ b/forum/skins/default/media/jquery-openid/images/vidoop.png diff --git a/forum/skins/default/media/jquery-openid/images/wordpress.ico b/forum/skins/default/media/jquery-openid/images/wordpress.ico Binary files differindex 31b7d2c2..31b7d2c2 100644..100755 --- a/forum/skins/default/media/jquery-openid/images/wordpress.ico +++ b/forum/skins/default/media/jquery-openid/images/wordpress.ico diff --git a/forum/skins/default/media/jquery-openid/images/wordpress.png b/forum/skins/default/media/jquery-openid/images/wordpress.png Binary files differindex ee29f0cf..ee29f0cf 100644..100755 --- a/forum/skins/default/media/jquery-openid/images/wordpress.png +++ b/forum/skins/default/media/jquery-openid/images/wordpress.png diff --git a/forum/skins/default/media/jquery-openid/images/yahoo.gif b/forum/skins/default/media/jquery-openid/images/yahoo.gif Binary files differindex 42adbfa5..42adbfa5 100644..100755 --- a/forum/skins/default/media/jquery-openid/images/yahoo.gif +++ b/forum/skins/default/media/jquery-openid/images/yahoo.gif diff --git a/forum/skins/default/media/jquery-openid/jquery.openid.js b/forum/skins/default/media/jquery-openid/jquery.openid.js index 8d1cd204..8d1cd204 100644..100755 --- a/forum/skins/default/media/jquery-openid/jquery.openid.js +++ b/forum/skins/default/media/jquery-openid/jquery.openid.js diff --git a/forum/skins/default/media/jquery-openid/openid.css b/forum/skins/default/media/jquery-openid/openid.css index 1b7aaf82..1b7aaf82 100644..100755 --- a/forum/skins/default/media/jquery-openid/openid.css +++ b/forum/skins/default/media/jquery-openid/openid.css diff --git a/forum/skins/default/media/js/com.cnprog.admin.js b/forum/skins/default/media/js/com.cnprog.admin.js index 39dff48c..39dff48c 100644..100755 --- a/forum/skins/default/media/js/com.cnprog.admin.js +++ b/forum/skins/default/media/js/com.cnprog.admin.js diff --git a/forum/skins/default/media/js/com.cnprog.editor.js b/forum/skins/default/media/js/com.cnprog.editor.js index 18cc5166..18cc5166 100644..100755 --- a/forum/skins/default/media/js/com.cnprog.editor.js +++ b/forum/skins/default/media/js/com.cnprog.editor.js diff --git a/forum/skins/default/media/js/com.cnprog.i18n.js b/forum/skins/default/media/js/com.cnprog.i18n.js index da9bf396..da9bf396 100644..100755 --- a/forum/skins/default/media/js/com.cnprog.i18n.js +++ b/forum/skins/default/media/js/com.cnprog.i18n.js diff --git a/forum/skins/default/media/js/com.cnprog.post.js b/forum/skins/default/media/js/com.cnprog.post.js index 4325e665..4325e665 100644..100755 --- a/forum/skins/default/media/js/com.cnprog.post.js +++ b/forum/skins/default/media/js/com.cnprog.post.js diff --git a/forum/skins/default/media/js/com.cnprog.tag_selector.js b/forum/skins/default/media/js/com.cnprog.tag_selector.js index e3279e65..e3279e65 100644..100755 --- a/forum/skins/default/media/js/com.cnprog.tag_selector.js +++ b/forum/skins/default/media/js/com.cnprog.tag_selector.js diff --git a/forum/skins/default/media/js/com.cnprog.utils.js b/forum/skins/default/media/js/com.cnprog.utils.js index 3f7720c1..3f7720c1 100644..100755 --- a/forum/skins/default/media/js/com.cnprog.utils.js +++ b/forum/skins/default/media/js/com.cnprog.utils.js diff --git a/forum/skins/default/media/js/compress.bat b/forum/skins/default/media/js/compress.bat index 5b2673cf..5b2673cf 100644..100755 --- a/forum/skins/default/media/js/compress.bat +++ b/forum/skins/default/media/js/compress.bat diff --git a/forum/skins/default/media/js/excanvas.pack.js b/forum/skins/default/media/js/excanvas.pack.js index 71d6fbd9..71d6fbd9 100644..100755 --- a/forum/skins/default/media/js/excanvas.pack.js +++ b/forum/skins/default/media/js/excanvas.pack.js diff --git a/forum/skins/default/media/js/flot-build.bat b/forum/skins/default/media/js/flot-build.bat index f9f32cb7..f9f32cb7 100644..100755 --- a/forum/skins/default/media/js/flot-build.bat +++ b/forum/skins/default/media/js/flot-build.bat diff --git a/forum/skins/default/media/js/jquery-1.2.6.js b/forum/skins/default/media/js/jquery-1.2.6.js index 88e661ee..88e661ee 100644..100755 --- a/forum/skins/default/media/js/jquery-1.2.6.js +++ b/forum/skins/default/media/js/jquery-1.2.6.js diff --git a/forum/skins/default/media/js/jquery-1.2.6.min.js b/forum/skins/default/media/js/jquery-1.2.6.min.js index 82b98e1d..82b98e1d 100644..100755 --- a/forum/skins/default/media/js/jquery-1.2.6.min.js +++ b/forum/skins/default/media/js/jquery-1.2.6.min.js diff --git a/forum/skins/default/media/js/jquery.ajaxfileupload.js b/forum/skins/default/media/js/jquery.ajaxfileupload.js index 75292776..75292776 100644..100755 --- a/forum/skins/default/media/js/jquery.ajaxfileupload.js +++ b/forum/skins/default/media/js/jquery.ajaxfileupload.js diff --git a/forum/skins/default/media/js/jquery.flot.js b/forum/skins/default/media/js/jquery.flot.js index 83b61929..83b61929 100644..100755 --- a/forum/skins/default/media/js/jquery.flot.js +++ b/forum/skins/default/media/js/jquery.flot.js diff --git a/forum/skins/default/media/js/jquery.flot.pack.js b/forum/skins/default/media/js/jquery.flot.pack.js index a5714f12..a5714f12 100644..100755 --- a/forum/skins/default/media/js/jquery.flot.pack.js +++ b/forum/skins/default/media/js/jquery.flot.pack.js diff --git a/forum/skins/default/media/js/jquery.form.js b/forum/skins/default/media/js/jquery.form.js index 443114fd..443114fd 100644..100755 --- a/forum/skins/default/media/js/jquery.form.js +++ b/forum/skins/default/media/js/jquery.form.js diff --git a/forum/skins/default/media/js/jquery.i18n.js b/forum/skins/default/media/js/jquery.i18n.js index 0a155a31..0a155a31 100644..100755 --- a/forum/skins/default/media/js/jquery.i18n.js +++ b/forum/skins/default/media/js/jquery.i18n.js diff --git a/forum/skins/default/media/js/jquery.openid.js b/forum/skins/default/media/js/jquery.openid.js index af7d8cb9..af7d8cb9 100644..100755 --- a/forum/skins/default/media/js/jquery.openid.js +++ b/forum/skins/default/media/js/jquery.openid.js diff --git a/forum/skins/default/media/js/jquery.validate.pack.js b/forum/skins/default/media/js/jquery.validate.pack.js index 49134500..49134500 100644..100755 --- a/forum/skins/default/media/js/jquery.validate.pack.js +++ b/forum/skins/default/media/js/jquery.validate.pack.js diff --git a/forum/skins/default/media/js/se_hilite.js b/forum/skins/default/media/js/se_hilite.js index 42e99c8e..42e99c8e 100644..100755 --- a/forum/skins/default/media/js/se_hilite.js +++ b/forum/skins/default/media/js/se_hilite.js diff --git a/forum/skins/default/media/js/se_hilite_src.js b/forum/skins/default/media/js/se_hilite_src.js index b604f156..b604f156 100644..100755 --- a/forum/skins/default/media/js/se_hilite_src.js +++ b/forum/skins/default/media/js/se_hilite_src.js diff --git a/forum/skins/default/media/js/wmd/images/wmd-buttons.png b/forum/skins/default/media/js/wmd/images/wmd-buttons.png Binary files differindex 50b37090..50b37090 100644..100755 --- a/forum/skins/default/media/js/wmd/images/wmd-buttons.png +++ b/forum/skins/default/media/js/wmd/images/wmd-buttons.png diff --git a/forum/skins/default/media/js/wmd/showdown-min.js b/forum/skins/default/media/js/wmd/showdown-min.js index 073613b1..073613b1 100644..100755 --- a/forum/skins/default/media/js/wmd/showdown-min.js +++ b/forum/skins/default/media/js/wmd/showdown-min.js diff --git a/forum/skins/default/media/js/wmd/showdown.js b/forum/skins/default/media/js/wmd/showdown.js index 3f4b9947..3f4b9947 100644..100755 --- a/forum/skins/default/media/js/wmd/showdown.js +++ b/forum/skins/default/media/js/wmd/showdown.js diff --git a/forum/skins/default/media/js/wmd/wmd-min.js b/forum/skins/default/media/js/wmd/wmd-min.js index aa643f1a..aa643f1a 100644..100755 --- a/forum/skins/default/media/js/wmd/wmd-min.js +++ b/forum/skins/default/media/js/wmd/wmd-min.js diff --git a/forum/skins/default/media/js/wmd/wmd-test.html b/forum/skins/default/media/js/wmd/wmd-test.html index d748501a..d748501a 100644..100755 --- a/forum/skins/default/media/js/wmd/wmd-test.html +++ b/forum/skins/default/media/js/wmd/wmd-test.html diff --git a/forum/skins/default/media/js/wmd/wmd.css b/forum/skins/default/media/js/wmd/wmd.css index 80c226c8..80c226c8 100644..100755 --- a/forum/skins/default/media/js/wmd/wmd.css +++ b/forum/skins/default/media/js/wmd/wmd.css diff --git a/forum/skins/default/media/js/wmd/wmd.js b/forum/skins/default/media/js/wmd/wmd.js index 70271d4d..70271d4d 100644..100755 --- a/forum/skins/default/media/js/wmd/wmd.js +++ b/forum/skins/default/media/js/wmd/wmd.js diff --git a/forum/skins/default/media/js/yuicompressor-2.4.2.jar b/forum/skins/default/media/js/yuicompressor-2.4.2.jar Binary files differindex c29470bd..c29470bd 100644..100755 --- a/forum/skins/default/media/js/yuicompressor-2.4.2.jar +++ b/forum/skins/default/media/js/yuicompressor-2.4.2.jar diff --git a/forum/skins/default/media/style/auth.css b/forum/skins/default/media/style/auth.css new file mode 100755 index 00000000..64ec6f3e --- /dev/null +++ b/forum/skins/default/media/style/auth.css @@ -0,0 +1,48 @@ +#bigicon_providers, #smallicon_providers {
+ display: block;
+ padding: 0px;
+ width:600px;
+ margin:0px 0px 5px 0px;
+}
+
+.provider_logo {
+ display: inline-block;
+ padding: 4px;
+ border: 1px solid #DDD;
+ text-align: center;
+ vertical-align: middle;
+}
+
+.provider_logo.big {
+ height: 40px;
+ width: 90px;
+}
+
+.provider_logo.small {
+ height: 32px;
+ width: 32px;
+}
+
+.provider_logo.selected {
+ outline: 2px solid #FFF8C6;
+}
+
+.provider_logo .provider_url {
+ display: none;
+}
+
+.signin_form input[type="text"], .signin_form input[type="password"], .signin_form input[type="submit"] {
+ height: 28px;
+ line-height: 22px;
+ font-size: 140%;
+ border: 1px solid #999;
+}
+
+.signin_form .icon_input {
+ padding-left: 20px;
+}
+
+.or_label {
+ margin-top: 20px;
+ margin-bottom: 10px;
+}
\ No newline at end of file diff --git a/forum/skins/default/media/style/default.css b/forum/skins/default/media/style/default.css index 27da1dab..27da1dab 100644..100755 --- a/forum/skins/default/media/style/default.css +++ b/forum/skins/default/media/style/default.css diff --git a/forum/skins/default/media/style/jquery.autocomplete.css b/forum/skins/default/media/style/jquery.autocomplete.css index 3bf2c2d9..3bf2c2d9 100644..100755 --- a/forum/skins/default/media/style/jquery.autocomplete.css +++ b/forum/skins/default/media/style/jquery.autocomplete.css diff --git a/forum/skins/default/media/style/openid.css b/forum/skins/default/media/style/openid.css index 0d201df2..0d201df2 100644..100755 --- a/forum/skins/default/media/style/openid.css +++ b/forum/skins/default/media/style/openid.css diff --git a/forum/skins/default/media/style/prettify.css b/forum/skins/default/media/style/prettify.css index 10a37577..10a37577 100644..100755 --- a/forum/skins/default/media/style/prettify.css +++ b/forum/skins/default/media/style/prettify.css diff --git a/forum/skins/default/media/style/style.css b/forum/skins/default/media/style/style.css index 02148ab0..02148ab0 100644..100755 --- a/forum/skins/default/media/style/style.css +++ b/forum/skins/default/media/style/style.css diff --git a/forum/skins/default/templates/404.html b/forum/skins/default/templates/404.html index 227de3ae..227de3ae 100644..100755 --- a/forum/skins/default/templates/404.html +++ b/forum/skins/default/templates/404.html diff --git a/forum/skins/default/templates/500.html b/forum/skins/default/templates/500.html index 51e73178..51e73178 100644..100755 --- a/forum/skins/default/templates/500.html +++ b/forum/skins/default/templates/500.html diff --git a/forum/skins/default/templates/about.html b/forum/skins/default/templates/about.html index 66dcc3fd..e463ac44 100644..100755 --- a/forum/skins/default/templates/about.html +++ b/forum/skins/default/templates/about.html @@ -26,7 +26,7 @@ These points (very) roughly reflect the level of trust of the community. </p> <p>No points are necessary to ask or answer the questions - so please - - <strong><a href="{% url user_signin %}">join us!</a></strong> + <strong><a href="{% url auth_signin %}">join us!</a></strong> </p> <p> If you would like to find out more about this site - please see <strong><a href="{% url faq %}">frequently asked questions</a></strong>. diff --git a/forum/skins/default/templates/account_settings.html b/forum/skins/default/templates/account_settings.html new file mode 100755 index 00000000..91267d26 --- /dev/null +++ b/forum/skins/default/templates/account_settings.html @@ -0,0 +1,45 @@ +{% extends "base_content.html" %} +<!-- settings.html --> +{% load i18n %} +{% block title %}{% spaceless %}{% trans "Account functions" %}{% endspaceless %}{% endblock %} +{% block head %} +<style type="text/css" media="screen"> + h4 {font-size:12pt;} + dt, dd { padding:0 0 0.35em 0; } + dt { float: left; width: 21ex; } + dd { margin-left: 23ex; } + + #settings-options, #settings-intro { padding: 4em 1.5em;} + #settings-options { min-height: 300px; border-left: 1px solid #333;} + + #settings-options h5 { font-weight: bold;} +</style> +{% endblock %} + +{% block content %} +<div id="main-bar"> + <h3><strong>{{ request.user.username }} {% trans "Profile" %}</strong></h3> +</div> +<div id="settings-options"> + {% if msg %} + <p class="error">{{ msg }}</p> + {% endif %} + + <dl class="list-item"> + <dt>» <a href="{% url user_changepw %}">{% trans "Change password" %}</a></dt> + <dd>{% trans "Give your account a new password." %}</dd> + {% comment %} + <dt>» <a href="{% url user_changeemail %}">{% trans "Change email " %}</a></dt> + <dd>{% trans "Add or update the email address associated with your account." %}</dd> + + <dt>» <a href="{% url user_changeopenid %}">{% trans "Change OpenID" %}</a></dt> + <dd>{% trans "Change openid associated to your account" %}</dd> + + + <dt>» <a href="{% url user_delete %}">{% trans "Delete account" %}</a></dt> + <dd>{% trans "Erase your username and all your data from website" %}</dd> + {% endcomment %} + </dl> +</div> +{% endblock %} +<!-- end settings.html --> diff --git a/forum/skins/default/templates/answer_edit.html b/forum/skins/default/templates/answer_edit.html index 2d736f30..2d736f30 100644..100755 --- a/forum/skins/default/templates/answer_edit.html +++ b/forum/skins/default/templates/answer_edit.html diff --git a/forum/skins/default/templates/answer_edit_tips.html b/forum/skins/default/templates/answer_edit_tips.html index c390da06..c390da06 100644..100755 --- a/forum/skins/default/templates/answer_edit_tips.html +++ b/forum/skins/default/templates/answer_edit_tips.html diff --git a/forum/skins/default/templates/ask.html b/forum/skins/default/templates/ask.html index 083b01d9..083b01d9 100644..100755 --- a/forum/skins/default/templates/ask.html +++ b/forum/skins/default/templates/ask.html diff --git a/forum/skins/default/templates/auth/complete.html b/forum/skins/default/templates/auth/complete.html new file mode 100755 index 00000000..cb2dc5aa --- /dev/null +++ b/forum/skins/default/templates/auth/complete.html @@ -0,0 +1,95 @@ +{% extends "base_content.html" %} +<!-- complete.html --> +{% load i18n %} +{% block head %}{% endblock %} +{% block title %}{% spaceless %}{% trans "Connect your OpenID with this site" %}{% endspaceless %}{% endblock %} +{% block content %} + <div id="main-bar" class="headNormal"> + {% trans "Connect your OpenID with your account on this site" %} + </div> + <div id="completetxt" > + <div class="message"> + <b>{% trans "You are here for the first time with " %}{{ provider }}</b> + {% trans "Please create your screen name and save your email address. Saved email address will let you subscribe for the updates on the most interesting questions and will be used to create and retrieve your unique avatar image. " %} + </div> + <p style="display:none">{% trans "This account already exists, please use another." %}</p> + </div> + + {% if form1.errors %} + <ul class="errorlist"> + {% if form1.non_field_errors %} + {% for error in form1.non_field_errors %} + <li>{{error}}</li> + {% endfor %} + {% endif %} + </ul> + {% endif %} + {% comment %} + {% if form2.errors %}<!--form2 is dysfunctional so commented out --> + <div class="errors"> + <span class="big">{% trans "Sorry, looks like we have some errors:" %}</span><br/> + <ul class="error-list"> + {% if form2.username.errors %} + <li><span class="error">{{ form2.username.errors|join:", " }}</span></li> + {% endif %} + {% if form2.password.errors %} + <li><span class="error">{{ form2.password.errors|join:", " }}</span></li> + {% endif %} + </ul> + </div> + {% endif %} + {% endcomment %} + + <div class="login"> + <form name="fregister" action="" method="POST"> + {{ form1.next }} + <div class="form-row-vertical"> + <label for="id_username">{% trans "Screen name label" %}</label> + {% if form1.username.errors %} + <p class="error">{{ form1.username.errors|join:", " }}</p> + {% endif %} + {{ form1.username }} + </div> + <div class="form-row-vertical margin-bottom"> + <label for="id_email">{% trans "Email address label" %}</label> + {% if form1.email.errors %} + <p class="error">{{ form1.email.errors|join:", " }}</p> + {% endif %} + {{ form1.email }} + </div> + <p>{% trans "receive updates motivational blurb" %}</p> + <div class='simple-subscribe-options'> + {{email_feeds_form.subscribe}} + {% if email_feeds_form.errors %} + <p class="error">{% trans "please select one of the options above" %}</p> + {% endif %} + </div> + <p class='space-above'>{% trans "Tag filter tool will be your right panel, once you log in." %}</p> + <div class="submit-row"><input type="submit" class="submit" name="bnewaccount" value="{% trans "create account" %}"/></div> + </form> + </div> + {% comment %}<!-- this form associates openID with an existing password-protected account, not yet functional --> + {% if form2 %} + <div class="login" style="display:none"> + <form name="fverify" action="{% url user_register %}" method="POST"> + {{ form2.next }} + <fieldset style="padding:10px"> + <legend class="big">{% trans "Existing account" %}</legend> + <div class="form-row"><label for="id_username">{% trans "user name" %}</label><br/>{{ form2.username }}</div> + <div class="form-row"><label for="id_passwordl">{% trans "password" %}</label><br/>{{ form2.password }}</div> + <p><span class='big strong'>(Optional) receive updates by email</span> - only sent when there are any.</p> + <div class='simple-subscribe-options'> + {{email_feeds_form.subscribe}} + </div> + <!--todo double check translation from chinese 确认 = "Register" --> + <div class="submit-row"> + <input type="submit" class="submit" name="bverify" value="{% trans "Register" %}"/> + <a href="{% url user_sendpw %}">{% trans "Forgot your password?" %}</a> + </div> + </fieldset> + </form> + </div> + {% endif %} + {% endcomment %} +{% endblock %} +<!-- end complete.html --> diff --git a/forum/skins/default/templates/auth/signin.html b/forum/skins/default/templates/auth/signin.html new file mode 100755 index 00000000..d4ee9fc1 --- /dev/null +++ b/forum/skins/default/templates/auth/signin.html @@ -0,0 +1,161 @@ +{% extends "base.html" %}
+
+{% load i18n %}
+{% load extra_tags %}
+
+{% block forejs %}
+ <link rel="stylesheet" type="text/css" media="screen" href="{% media "/media/style/auth.css" %}"/>
+ {% for provider in all_providers %}
+ {% for location in provider.extra_css %}
+ <link rel="stylesheet" type="text/css" media="screen" href="{{ location }}"/>
+ {% endfor %}
+ {% endfor %}
+{% endblock %}
+
+{% block content %}
+ {% for provider in all_providers %}
+ {% if provider.pre_code %}
+ {{ provider.pre_code|safe }}
+ {% endif %}
+ {% endfor %}
+ <div class="headNormal">
+ {% trans "User login" %}
+ </div>
+ {% if msg %}
+ <p class="warning">{{ msg }}</p>
+ {% endif %}
+
+ <div style="width:600px;float:left;margin-bottom:5px;">
+ {% trans "Click to sign in through any of these services." %}
+ </div>
+ {% if request.user.is_anonymous %}
+ <div style="width:600px;float:left;margin-bottom:5px;">
+ <input type="checkbox" checked="checked" id="validate_email" />
+ {% trans "Take the opurtunity to validate my email next to the external provider I choose." %}
+ </div>
+ {% endif %}
+ <div id="bigicon_providers">
+ {% for provider in bigicon_providers %}
+ <div class="provider_logo big" name="{{ provider.id }}">
+ {% ifequal provider.type "DIRECT" %}
+ <a class="provider_direct" href="{% url auth_provider_signin provider=provider.id %}">
+ <img src="{% media provider.icon %}" />
+ </a>
+ {% endifequal %}
+ {% ifequal provider.type "CUSTOM" %}
+ {% include provider.code_template %}
+ {% endifequal %}
+ {% ifequal provider.type "SIMPLE_FORM" %}
+ <img alt="{{ provider.simple_form_context.your_what }}" class="simple_form_provider" src="{% media provider.icon %}" />
+ {% endifequal %}
+ </div>
+ {% endfor %}
+ </div>
+ <div id="smallicon_providers">
+ {% for provider in smallicon_providers %}
+ <div class="provider_logo small" name="{{ provider.id }}">
+ {% ifequal provider.type "DIRECT" %}
+ <a class="provider_direct" href="{% url auth_provider_signin provider=provider.id %}">
+ <img src="{% media provider.icon %}" />
+ </a>
+ {% endifequal %}
+ {% ifequal provider.type "CUSTOM" %}
+ {% include provider.code_template %}
+ {% endifequal %}
+ {% ifequal provider.type "SIMPLE_FORM" %}
+ <img alt="{{ provider.simple_form_context.your_what }}" class="simple_form_provider" src="{% media provider.icon %}" />
+ {% endifequal %}
+ </div>
+ {% endfor %}
+ </div>
+ <form name="signin_form" id="signin_form" class="signin_form" method="POST" action="">
+ <div id="signin_form_slot"></div>
+ <input type="hidden" class="validate_email" name="validate_email" value="yes" />
+ </form>
+ {% for provider in stackitem_providers %}
+ <h3 class="or_label">Or...</h3>
+ <form class="signin_form" method="POST" action="{% url auth_provider_signin provider=provider.id %}">
+ {% include provider.stack_item_template %}
+ <input type="hidden" class="validate_email" name="validate_email" value="yes" />
+ </form>
+ {% endfor %}
+ <script type="text/html" id="simple_form_template">
+ <fieldset id="slot_form">
+ <p id="provider_name_slot">{% trans 'Enter your ' %}%%YOUR_WHAT%%</p>
+ <div><p><span></span>
+ <input id="input_field" type="text" name="input_field" /><span></span>
+ <input id="ssignin" name="ssignin" type="submit" value="Login" />
+ </p></div>
+ <input type="hidden" class="validate_email" name="validate_email" value="yes" />
+ </fieldset>
+ </script>
+ <script type="text/javascript">
+ $(function() {
+ var signin_url = "{% url auth_provider_signin provider='PROVIDER' %}";
+
+ function set_validate_email() {
+ var validate = $('#validate_email').attr('checked') ? 'yes' : 'no';
+ $('.validate_email').attr('value', validate);
+
+ $('.provider_direct').each(function() {
+ var current_url = $(this).attr('href');
+ if (!/\?validate_email\=(yes|no)$/.test(current_url)) {
+ current_url += ('?validate_email=' + validate);
+ } else {
+ current_url = current_url.replace(/(yes|no)$/, validate);
+ }
+
+ $(this).attr('href', current_url);
+ })
+ }
+
+ $('#validate_email').change(set_validate_email);
+
+ function set_form_action(el) {
+ var provider = el.parents('.provider_logo').attr('name');
+ $('#signin_form').attr('action', signin_url.replace('PROVIDER', provider));
+ }
+
+ $('.provider_logo').click(function() {
+ $('.provider_logo').removeClass('selected');
+ $(this).addClass('selected');
+ });
+
+ $('.simple_form_provider').click(function() {
+ $('#signin_form_slot').html('');
+ var new_html = $('#simple_form_template').html()
+ .replace('%%YOUR_WHAT%%', $(this).attr('alt'));
+ $('#signin_form_slot').html(new_html);
+ set_form_action($(this));
+ set_validate_email();
+ })
+
+ set_validate_email();
+ });
+ </script>
+{% endblock %}
+
+{% block sidebar %}
+<div class="boxC">
+ <h3 class="subtitle">{% trans "Why use OpenID?" %}</h3>
+ <ul class="list-item">
+ <li>
+ {% trans "with openid it is easier" %}
+ </li>
+ <li>
+ {% trans "reuse openid" %}
+ </li>
+ <li>
+ {% trans "openid is widely adopted" %}
+ </li>
+ <li>
+ {% trans "openid is supported open standard" %}
+ </li>
+
+ </ul>
+ <p class="info-box-follow-up-links">
+ <a href="http://openid.net/what/" target="_blank">{% trans "Find out more" %} </a><br/>
+ <a href="http://openid.net/get/" target="_blank">{% trans "Get OpenID" %} </a>
+ </p>
+</div>
+{% endblock%}
\ No newline at end of file diff --git a/forum/skins/default/templates/auth/signup.html b/forum/skins/default/templates/auth/signup.html new file mode 100755 index 00000000..bd5750b4 --- /dev/null +++ b/forum/skins/default/templates/auth/signup.html @@ -0,0 +1,32 @@ +{% extends "base_content.html" %} +<!--signup.html--> +{% load i18n %} +{% block title %}{% spaceless %}{% trans "Signup" %}{% endspaceless %}{% endblock %} + +{% block content %} +<div class="headNormal"> + {% trans "Create login name and password" %} +</div> +<p class="message">{% trans "Traditional signup info" %}</p> +<form action="" method="post" accept-charset="utf-8"> + <ul class="form-horizontal-rows"> + <li><label for="usename_id">{{form.username.label}}</label>{{form.username}}{{form.username.errors}}</li> + <li><label for="email_id">{{form.email.label}}</label>{{form.email}}{{form.email.errors}}</li> + <li><label for="password1_id">{{form.password1.label}}</label>{{form.password1}}{{form.password1.errors}}</li> + <li><label for="password2_id">{{form.password2.label}}</label>{{form.password2}}{{form.password2.errors}}</li> + </ul> + <p class="margin-top">{% trans "receive updates motivational blurb" %}</p> + <div class='simple-subscribe-options'> + {{ email_feeds_form.subscribe }} + {% if email_feeds_form.errors %} + <p class="error">{% trans "please select one of the options above" %}</p> + {% endif %} + </div> + {% comment %}<p class="signup_p">{% trans "Please read and type in the two words below to help us prevent automated account creation." %}</p> + {{form.recaptcha}}{% endcomment %} + <div class="submit-row"><input type="submit" class="submit" value="{% trans "Create Account" %}" /> + <strong>{% trans "or" %} + <a href="{% url auth_signin %}">{% trans "return to login page" %}</a></strong></div> +</form> +{% endblock %} +<!--end signup.html--> diff --git a/forum/skins/default/templates/badge.html b/forum/skins/default/templates/badge.html index af6aa2a2..af6aa2a2 100644..100755 --- a/forum/skins/default/templates/badge.html +++ b/forum/skins/default/templates/badge.html diff --git a/forum/skins/default/templates/badges.html b/forum/skins/default/templates/badges.html index 8de93df5..8de93df5 100644..100755 --- a/forum/skins/default/templates/badges.html +++ b/forum/skins/default/templates/badges.html diff --git a/forum/skins/default/templates/base_content.html b/forum/skins/default/templates/base_content.html index d1cf673b..d1cf673b 100644..100755 --- a/forum/skins/default/templates/base_content.html +++ b/forum/skins/default/templates/base_content.html diff --git a/forum/skins/default/templates/book.html b/forum/skins/default/templates/book.html index 8574fa73..8574fa73 100644..100755 --- a/forum/skins/default/templates/book.html +++ b/forum/skins/default/templates/book.html diff --git a/forum/skins/default/templates/changepw.html b/forum/skins/default/templates/changepw.html new file mode 100755 index 00000000..7b4cf801 --- /dev/null +++ b/forum/skins/default/templates/changepw.html @@ -0,0 +1,18 @@ +{% extends "base.html" %} +<!-- changepw.html --> +{% load i18n %} +{% block head %}{% endblock %} +{% block title %}{% spaceless %}{% trans "Change password" %}{% endspaceless %}{% endblock %} +{% block content %} +<div class="headNormal">{% trans "Account: change password" %}</div> +<p class="message">{% blocktrans %}This is where you can change your password. Make sure you remember it!{% endblocktrans %}</p> +<div class="aligned"> + <form action="" method="post" accept-charset="utf-8"> + <ul id="changepw-form" class="form-horizontal-rows"> + {{form.as_ul}} + </ul> + <div class="submit-row"><input type="submit" class="submit" value="{% trans "Change password" %}" /></div> + </form> + </div> +{% endblock %} +<!-- end changepw.html --> diff --git a/forum/skins/default/templates/close.html b/forum/skins/default/templates/close.html index d9e73507..d9e73507 100644..100755 --- a/forum/skins/default/templates/close.html +++ b/forum/skins/default/templates/close.html diff --git a/forum/skins/default/templates/edit_user_email_feeds_form.html b/forum/skins/default/templates/edit_user_email_feeds_form.html index 65902e7e..65902e7e 100644..100755 --- a/forum/skins/default/templates/edit_user_email_feeds_form.html +++ b/forum/skins/default/templates/edit_user_email_feeds_form.html diff --git a/forum/skins/default/templates/faq.html b/forum/skins/default/templates/faq.html index 236f4f76..284e1229 100644..100755 --- a/forum/skins/default/templates/faq.html +++ b/forum/skins/default/templates/faq.html @@ -97,6 +97,7 @@ </table> </div> + {% comment %} {% ifequal settings.EMAIL_VALIDATION 'on' %} <div> <a id='validate'></a><h3 class="subtitle">{% trans "how to validate email title" %}</h3> @@ -104,6 +105,7 @@ {% blocktrans %}how to validate email info with {{send_email_key_url}} {{gravatar_faq_url}}{% endblocktrans %} </div> {% endifequal %} + {% endcomment %} <div> <a id='gravatar'></a><h3 class="subtitle">{% trans "what is gravatar" %}</h3> <p>{% trans "gravatar faq info" %}</p> @@ -111,7 +113,7 @@ <div> <h3 class="subtitle">{% trans "To register, do I need to create new password?" %}</h3> <p>{% trans "No, you don't have to. You can login through any service that supports OpenID, e.g. Google, Yahoo, AOL, etc." %} - <strong><a href="{% url user_signin %}">{% trans "Login now!" %}</a> »</strong> + <strong><a href="{% url auth_signin %}">{% trans "Login now!" %}</a> »</strong> </p> </div> diff --git a/forum/skins/default/templates/feedback.html b/forum/skins/default/templates/feedback.html index 38bb48ff..38bb48ff 100644..100755 --- a/forum/skins/default/templates/feedback.html +++ b/forum/skins/default/templates/feedback.html diff --git a/forum/skins/default/templates/feedback_email.txt b/forum/skins/default/templates/feedback_email.txt index df768180..df768180 100644..100755 --- a/forum/skins/default/templates/feedback_email.txt +++ b/forum/skins/default/templates/feedback_email.txt diff --git a/forum/skins/default/templates/feeds/rss_description.html b/forum/skins/default/templates/feeds/rss_description.html index fa781907..fa781907 100644..100755 --- a/forum/skins/default/templates/feeds/rss_description.html +++ b/forum/skins/default/templates/feeds/rss_description.html diff --git a/forum/skins/default/templates/feeds/rss_title.html b/forum/skins/default/templates/feeds/rss_title.html index 7899fce3..7899fce3 100644..100755 --- a/forum/skins/default/templates/feeds/rss_title.html +++ b/forum/skins/default/templates/feeds/rss_title.html diff --git a/forum/skins/default/templates/footer.html b/forum/skins/default/templates/footer.html index 89d4801f..89d4801f 100644..100755 --- a/forum/skins/default/templates/footer.html +++ b/forum/skins/default/templates/footer.html diff --git a/forum/skins/default/templates/header.html b/forum/skins/default/templates/header.html index 3afc46c5..cb12bb97 100644..100755 --- a/forum/skins/default/templates/header.html +++ b/forum/skins/default/templates/header.html @@ -8,7 +8,7 @@ <a href="{% url users %}{{ request.user.id }}/{{ request.user.username }}/">{{ request.user.username }}</a> {% get_score_badge request.user %} <a href="{% url logout %}">{% trans "logout" %}</a> {% else %} - <a href="{% url user_signin %}">{% trans "login" %}</a> + <a href="{% url auth_signin %}">{% trans "login" %}</a> {% endif %} <a href="{% url about %}">{% trans "about" %}</a> <a href="{% url faq %}">{% trans "faq" %}</a> diff --git a/forum/skins/default/templates/logout.html b/forum/skins/default/templates/logout.html index 650ba044..650ba044 100644..100755 --- a/forum/skins/default/templates/logout.html +++ b/forum/skins/default/templates/logout.html diff --git a/forum/skins/default/templates/notarobot.html b/forum/skins/default/templates/notarobot.html index 698c5696..698c5696 100644..100755 --- a/forum/skins/default/templates/notarobot.html +++ b/forum/skins/default/templates/notarobot.html diff --git a/forum/skins/default/templates/pagesize.html b/forum/skins/default/templates/pagesize.html index 5037f1f6..5037f1f6 100644..100755 --- a/forum/skins/default/templates/pagesize.html +++ b/forum/skins/default/templates/pagesize.html diff --git a/forum/skins/default/templates/paginator.html b/forum/skins/default/templates/paginator.html index 2fba5425..2fba5425 100644..100755 --- a/forum/skins/default/templates/paginator.html +++ b/forum/skins/default/templates/paginator.html diff --git a/forum/skins/default/templates/post_contributor_info.html b/forum/skins/default/templates/post_contributor_info.html index 9997be5f..9997be5f 100644..100755 --- a/forum/skins/default/templates/post_contributor_info.html +++ b/forum/skins/default/templates/post_contributor_info.html diff --git a/forum/skins/default/templates/privacy.html b/forum/skins/default/templates/privacy.html index e66086dd..e66086dd 100644..100755 --- a/forum/skins/default/templates/privacy.html +++ b/forum/skins/default/templates/privacy.html diff --git a/forum/skins/default/templates/question.html b/forum/skins/default/templates/question.html index fe9f5cde..23c24113 100644..100755 --- a/forum/skins/default/templates/question.html +++ b/forum/skins/default/templates/question.html @@ -32,7 +32,7 @@ {% if not question.closed and request.user.is_authenticated %}initEditor();{% endif %}
lanai.highlightSyntax();
- $('#btLogin').bind('click', function(){window.location.href='{% url user_signin %}'; } )
+ $('#btLogin').bind('click', function(){window.location.href='{% url auth_signin %}'; } )
});
function initEditor(){
diff --git a/forum/skins/default/templates/question_edit.html b/forum/skins/default/templates/question_edit.html index fe711849..fe711849 100644..100755 --- a/forum/skins/default/templates/question_edit.html +++ b/forum/skins/default/templates/question_edit.html diff --git a/forum/skins/default/templates/question_edit_tips.html b/forum/skins/default/templates/question_edit_tips.html index 4cabea79..4cabea79 100644..100755 --- a/forum/skins/default/templates/question_edit_tips.html +++ b/forum/skins/default/templates/question_edit_tips.html diff --git a/forum/skins/default/templates/question_retag.html b/forum/skins/default/templates/question_retag.html index 03f3da04..03f3da04 100644..100755 --- a/forum/skins/default/templates/question_retag.html +++ b/forum/skins/default/templates/question_retag.html diff --git a/forum/skins/default/templates/question_summary_list_roll.html b/forum/skins/default/templates/question_summary_list_roll.html index 57685d6d..57685d6d 100644..100755 --- a/forum/skins/default/templates/question_summary_list_roll.html +++ b/forum/skins/default/templates/question_summary_list_roll.html diff --git a/forum/skins/default/templates/questions.html b/forum/skins/default/templates/questions.html index 4c3b96d2..4c3b96d2 100644..100755 --- a/forum/skins/default/templates/questions.html +++ b/forum/skins/default/templates/questions.html diff --git a/forum/skins/default/templates/reopen.html b/forum/skins/default/templates/reopen.html index 37fb69c1..37fb69c1 100644..100755 --- a/forum/skins/default/templates/reopen.html +++ b/forum/skins/default/templates/reopen.html diff --git a/forum/skins/default/templates/revisions_answer.html b/forum/skins/default/templates/revisions_answer.html index b2e33dfe..b2e33dfe 100644..100755 --- a/forum/skins/default/templates/revisions_answer.html +++ b/forum/skins/default/templates/revisions_answer.html diff --git a/forum/skins/default/templates/revisions_question.html b/forum/skins/default/templates/revisions_question.html index 86d52a36..86d52a36 100644..100755 --- a/forum/skins/default/templates/revisions_question.html +++ b/forum/skins/default/templates/revisions_question.html diff --git a/forum/skins/default/templates/tag_selector.html b/forum/skins/default/templates/tag_selector.html index 7686d717..7686d717 100644..100755 --- a/forum/skins/default/templates/tag_selector.html +++ b/forum/skins/default/templates/tag_selector.html diff --git a/forum/skins/default/templates/tags.html b/forum/skins/default/templates/tags.html index 50f90fb1..50f90fb1 100644..100755 --- a/forum/skins/default/templates/tags.html +++ b/forum/skins/default/templates/tags.html diff --git a/forum/skins/default/templates/user.html b/forum/skins/default/templates/user.html index 5931f31c..5931f31c 100644..100755 --- a/forum/skins/default/templates/user.html +++ b/forum/skins/default/templates/user.html diff --git a/forum/skins/default/templates/user_edit.html b/forum/skins/default/templates/user_edit.html index 040ebff4..040ebff4 100644..100755 --- a/forum/skins/default/templates/user_edit.html +++ b/forum/skins/default/templates/user_edit.html diff --git a/forum/skins/default/templates/user_email_subscriptions.html b/forum/skins/default/templates/user_email_subscriptions.html index c0204cbc..c0204cbc 100644..100755 --- a/forum/skins/default/templates/user_email_subscriptions.html +++ b/forum/skins/default/templates/user_email_subscriptions.html diff --git a/forum/skins/default/templates/user_favorites.html b/forum/skins/default/templates/user_favorites.html index 9db01e9a..9db01e9a 100644..100755 --- a/forum/skins/default/templates/user_favorites.html +++ b/forum/skins/default/templates/user_favorites.html diff --git a/forum/skins/default/templates/user_footer.html b/forum/skins/default/templates/user_footer.html index ee347742..ee347742 100644..100755 --- a/forum/skins/default/templates/user_footer.html +++ b/forum/skins/default/templates/user_footer.html diff --git a/forum/skins/default/templates/user_info.html b/forum/skins/default/templates/user_info.html index c550e13f..0ce4e77a 100644..100755 --- a/forum/skins/default/templates/user_info.html +++ b/forum/skins/default/templates/user_info.html @@ -45,6 +45,10 @@ <span class="user-edit-link"><a href="{% url users %}{{ view_user.id }}/{% trans "edit/" %}">{% trans "update profile" %}</a></span> {% endif %} {% separator %} + {% ifequal request.user view_user %} + <a href="{% url auth_signin %}">add authentication method</a> + {% endifequal %} + {% separator %} {% if request.user.has_usable_password %} <a href="{% url user_changepw %}">change password</a> {% endif %} diff --git a/forum/skins/default/templates/user_recent.html b/forum/skins/default/templates/user_recent.html index b704ab25..b704ab25 100644..100755 --- a/forum/skins/default/templates/user_recent.html +++ b/forum/skins/default/templates/user_recent.html diff --git a/forum/skins/default/templates/user_reputation.html b/forum/skins/default/templates/user_reputation.html index 776935ae..776935ae 100644..100755 --- a/forum/skins/default/templates/user_reputation.html +++ b/forum/skins/default/templates/user_reputation.html diff --git a/forum/skins/default/templates/user_responses.html b/forum/skins/default/templates/user_responses.html index c4f4ffed..c4f4ffed 100644..100755 --- a/forum/skins/default/templates/user_responses.html +++ b/forum/skins/default/templates/user_responses.html diff --git a/forum/skins/default/templates/user_stats.html b/forum/skins/default/templates/user_stats.html index a3f88131..a3f88131 100644..100755 --- a/forum/skins/default/templates/user_stats.html +++ b/forum/skins/default/templates/user_stats.html diff --git a/forum/skins/default/templates/user_tabs.html b/forum/skins/default/templates/user_tabs.html index 908e8430..908e8430 100644..100755 --- a/forum/skins/default/templates/user_tabs.html +++ b/forum/skins/default/templates/user_tabs.html diff --git a/forum/skins/default/templates/user_votes.html b/forum/skins/default/templates/user_votes.html index b56aab01..b56aab01 100644..100755 --- a/forum/skins/default/templates/user_votes.html +++ b/forum/skins/default/templates/user_votes.html diff --git a/forum/skins/default/templates/users.html b/forum/skins/default/templates/users.html index 3a59b0c0..3a59b0c0 100644..100755 --- a/forum/skins/default/templates/users.html +++ b/forum/skins/default/templates/users.html diff --git a/forum/skins/default/templates/users_questions.html b/forum/skins/default/templates/users_questions.html index 8049d832..8049d832 100644..100755 --- a/forum/skins/default/templates/users_questions.html +++ b/forum/skins/default/templates/users_questions.html |