From oi-svn at pardus.org.tr Wed Dec 1 18:35:47 2010 From: oi-svn at pardus.org.tr (=?utf-8?q?=C4=B0lker_Kesen?=) Date: Wed, 1 Dec 2010 18:35:47 +0200 (EET) Subject: [Oi-commits] trunk/tema - fix for #50 Message-ID: <20101201163548.15A8C49CC76@ns1.pardus.org.tr> Author: ilker Date: Wed Dec 1 18:35:47 2010 New Revision: 3586 Modified: trunk/tema/admin.py Log: fix for #50 --- admin.py | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) Modified: trunk/tema/admin.py ================================================================= --- trunk/tema/admin.py (original) +++ trunk/tema/admin.py Wed Dec 1 18:35:47 2010 @@ -73,19 +73,12 @@ class OpenOfficeTemplateAdmin(ThemeItemAdmin): list_display = ("title", "version", "author", "license", "status") - -class PackageScreenshotAdmin(ThemeItemAdmin): - fieldsets = ( - (None, { - "fields": ("thumbnail", "title", "slug", "pardusVersion", "text", - "changelog", "image", "s_image""status", "deny_reason", "tags") - }), - ("Di?er", { - "classes": "collapse", - "fields": ("author", "license", "rating", "download_count", "submit", "update", "comment_enabled") - }) - ) +class OpenOfficeExtensionAdmin(ThemeItemAdmin): + list_display = ("title", "version", "author", "license", "status") + +class PackageScreenshotAdmin(ThemeItemAdmin): + list_display = ("title", "version", "author", "license", "status") class CategoryAdmin(admin.ModelAdmin): prepopulated_fields = {"slug": ("name",)} @@ -102,8 +95,6 @@ admin.site.register(OpenOfficeExtensionCategory) admin.site.register(OpenOfficeTheme) admin.site.register(OpenOfficeTemplate,OpenOfficeTemplateAdmin) -admin.site.register(OpenOfficeExtension) -admin.site.register(OpenOfficeApplication) -admin.site.register(OpenOfficeVersion) +admin.site.register(OpenOfficeExtension, OpenOfficeExtensionAdmin) admin.site.register(IconSet,IconSetAdmin) -admin.site.register(PackageScreenshot) +admin.site.register(PackageScreenshot, PackageScreenshotAdmin) From oi-svn at pardus.org.tr Wed Dec 1 19:36:08 2010 From: oi-svn at pardus.org.tr (=?utf-8?q?=C4=B0lker_Kesen?=) Date: Wed, 1 Dec 2010 19:36:08 +0200 (EET) Subject: [Oi-commits] trunk/tema - some administration classes do not need 'version', ... Message-ID: <20101201173608.EF46749CC76@ns1.pardus.org.tr> Author: ilker Date: Wed Dec 1 19:36:08 2010 New Revision: 3587 Modified: trunk/tema/admin.py Log: some administration classes do not need 'version', eliminate it and add forgotten list_displays --- admin.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) Modified: trunk/tema/admin.py ================================================================= --- trunk/tema/admin.py (original) +++ trunk/tema/admin.py Wed Dec 1 19:36:08 2010 @@ -31,6 +31,7 @@ } class WallpaperAdmin(ThemeItemAdmin): + list_display = ("title", "author", "license", "status") fieldsets = ( (None, { "fields": ("thumbnail", "title", "slug","category", "origin_url", "text", @@ -43,6 +44,7 @@ ) class DesktopScreenshotAdmin(ThemeItemAdmin): + list_display = ("title", "author", "license", "status") fieldsets = ( (None, { "fields": ("thumbnail", "title", "slug", "text", @@ -69,7 +71,7 @@ ) class IconSetAdmin(ThemeItemAdmin): - list_display = ("title", "version", "author", "license", "status") + list_display = ("title", "author", "license", "status") class OpenOfficeTemplateAdmin(ThemeItemAdmin): list_display = ("title", "version", "author", "license", "status") From oi-svn at pardus.org.tr Thu Dec 2 19:28:28 2010 From: oi-svn at pardus.org.tr (=?utf-8?q?=C4=B0lker_Kesen?=) Date: Thu, 2 Dec 2010 19:28:28 +0200 (EET) Subject: [Oi-commits] trunk/tema - order by -update Message-ID: <20101202172828.8193F49CBB1@ns1.pardus.org.tr> Author: ilker Date: Thu Dec 2 19:28:28 2010 New Revision: 3588 Modified: trunk/tema/views.py Log: order by -update --- views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: trunk/tema/views.py ================================================================= --- trunk/tema/views.py (original) +++ trunk/tema/views.py Thu Dec 2 19:28:28 2010 @@ -129,7 +129,7 @@ def list_user(request, username): "Theme items of a user" user = get_object_or_404(User, username=username) - themeItems = ThemeItem.objects.filter(status=True, author=user) + themeItems = ThemeItem.objects.filter(status=True, author=user).order_by("-update") params={ 'queryset': themeItems, From oi-svn at pardus.org.tr Thu Dec 2 19:40:18 2010 From: oi-svn at pardus.org.tr (=?utf-8?q?=C4=B0lker_Kesen?=) Date: Thu, 2 Dec 2010 19:40:18 +0200 (EET) Subject: [Oi-commits] trunk/media/css/new - fix for #51 Message-ID: <20101202174018.67BBD49CBB1@ns1.pardus.org.tr> Author: ilker Date: Thu Dec 2 19:40:18 2010 New Revision: 3589 Modified: trunk/media/css/new/tema.css Log: fix for #51 --- tema.css | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) Modified: trunk/media/css/new/tema.css ================================================================= --- trunk/media/css/new/tema.css (original) +++ trunk/media/css/new/tema.css Thu Dec 2 19:40:18 2010 @@ -70,7 +70,12 @@ .themeitem.first { float: left; - width: 50%; + width: 49%; + border-right: 1px solid #EAEAEA; + margin-right: 4px; +} + +.themeitem.second { } .themeitem .title a { From oi-svn at pardus.org.tr Fri Dec 3 17:33:00 2010 From: oi-svn at pardus.org.tr (=?utf-8?q?=C4=B0lker_Kesen?=) Date: Fri, 3 Dec 2010 17:33:00 +0200 (EET) Subject: [Oi-commits] trunk/media/css/new - it is better Message-ID: <20101203153300.88E4E49C9F2@ns1.pardus.org.tr> Author: ilker Date: Fri Dec 3 17:33:00 2010 New Revision: 3590 Modified: trunk/media/css/new/tema.css Log: it is better --- tema.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: trunk/media/css/new/tema.css ================================================================= --- trunk/media/css/new/tema.css (original) +++ trunk/media/css/new/tema.css Fri Dec 3 17:33:00 2010 @@ -70,9 +70,9 @@ .themeitem.first { float: left; - width: 49%; + width: 48%; border-right: 1px solid #EAEAEA; - margin-right: 4px; + margin-right: 9px; } .themeitem.second { From oi-svn at pardus.org.tr Fri Dec 3 18:31:07 2010 From: oi-svn at pardus.org.tr (=?utf-8?q?=C4=B0lker_Kesen?=) Date: Fri, 3 Dec 2010 18:31:07 +0200 (EET) Subject: [Oi-commits] trunk/media/css/new - add missing border-right Message-ID: <20101203163108.4575A49C9F2@ns1.pardus.org.tr> Author: ilker Date: Fri Dec 3 18:31:07 2010 New Revision: 3591 Modified: trunk/media/css/new/tema.css Log: add missing border-right --- tema.css | 1 + 1 file changed, 1 insertion(+) Modified: trunk/media/css/new/tema.css ================================================================= --- trunk/media/css/new/tema.css (original) +++ trunk/media/css/new/tema.css Fri Dec 3 18:31:07 2010 @@ -76,6 +76,7 @@ } .themeitem.second { + border-right: 1px solid #EAEAEA; } .themeitem .title a { From oi-svn at pardus.org.tr Sat Dec 4 17:28:29 2010 From: oi-svn at pardus.org.tr (=?utf-8?q?=C4=B0lker_Kesen?=) Date: Sat, 4 Dec 2010 17:28:29 +0200 (EET) Subject: [Oi-commits] trunk/tema - change models, eliminate obsolete parts Message-ID: <20101204152829.04DD649C9F6@ns1.pardus.org.tr> Author: ilker Date: Sat Dec 4 17:28:28 2010 New Revision: 3592 Modified: trunk/tema/models.py Log: change models, eliminate obsolete parts --- models.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) Modified: trunk/tema/models.py ================================================================= --- trunk/tema/models.py (original) +++ trunk/tema/models.py Sat Dec 4 17:28:28 2010 @@ -245,10 +245,7 @@ class OpenOfficeTheme(ThemeItem): file = models.FileField("OpenOffice dosyas?", upload_to="upload/tema/openoffice/%Y/%m/%d") - screenshot = models.ImageField("Ekran g?r?nt?s?", help_text="?ablonunuzun nas?l g?r?nd???ne dair bir ekran g?r?nt?n?z? burada payla??n",upload_to="upload/tema/openoffice/%Y/%m/%d",blank=False,null=True) - competible_with = models.ManyToManyField(OpenOfficeVersion, verbose_name=u"Uyumlu oldu?u OpenOffice.org versiyonlar?") - - #competible_with_higher = models.BooleanField(verbose_name=u"?st? ile uyumlu") + screenshot = models.ImageField("Ekran g?r?nt?s?", help_text="?ablonunuzun nas?l g?r?nd???ne dair bir ekran g?r?nt?n?z? burada payla??n", upload_to="upload/tema/openoffice/%Y/%m/%d",blank=True,null=True) class Meta: verbose_name = "Open Office ?zelle?tirmesi" @@ -262,7 +259,6 @@ class OpenOfficeTemplate(OpenOfficeTheme): category = models.ForeignKey("OpenOfficeTemplateCategory",verbose_name="Kategori") - application = models.ForeignKey(OpenOfficeApplication,verbose_name="OpenOffice.org uygulamas?",help_text="?ablonun ait oldu?u OpenOffice.org uygulamas?") class Meta: verbose_name = u"Open Office ?ablonu" From oi-svn at pardus.org.tr Sat Dec 4 17:32:28 2010 From: oi-svn at pardus.org.tr (=?utf-8?q?=C4=B0lker_Kesen?=) Date: Sat, 4 Dec 2010 17:32:28 +0200 (EET) Subject: [Oi-commits] trunk/tema - eliminate forgotten class Message-ID: <20101204153228.E2E2049C9F6@ns1.pardus.org.tr> Author: ilker Date: Sat Dec 4 17:32:28 2010 New Revision: 3593 Modified: trunk/tema/models.py Log: eliminate forgotten class --- models.py | 13 ------------- 1 file changed, 13 deletions(-) Modified: trunk/tema/models.py ================================================================= --- trunk/tema/models.py (original) +++ trunk/tema/models.py Sat Dec 4 17:32:28 2010 @@ -229,19 +229,6 @@ def get_download_url(self): return self.file.url -class OpenOfficeApplication(models.Model): - name = models.CharField(max_length=50) - - def __unicode__(self): - return self.name - -class OpenOfficeVersion(models.Model): - version = models.CharField(max_length=50) - version_number = models.PositiveIntegerField() - - def __unicode__(self): - return self.version - class OpenOfficeTheme(ThemeItem): file = models.FileField("OpenOffice dosyas?", upload_to="upload/tema/openoffice/%Y/%m/%d") From oi-svn at pardus.org.tr Sat Dec 4 17:33:38 2010 From: oi-svn at pardus.org.tr (=?utf-8?q?=C4=B0lker_Kesen?=) Date: Sat, 4 Dec 2010 17:33:38 +0200 (EET) Subject: [Oi-commits] trunk/tema - fix for #46 Message-ID: <20101204153339.0594549C9F6@ns1.pardus.org.tr> Author: ilker Date: Sat Dec 4 17:33:38 2010 New Revision: 3594 Modified: trunk/tema/views.py Log: fix for #46 --- views.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) Modified: trunk/tema/views.py ================================================================= --- trunk/tema/views.py (original) +++ trunk/tema/views.py Sat Dec 4 17:33:38 2010 @@ -252,17 +252,17 @@ item.author = request.user item.submit = item.update = datetime.datetime.now() slug = slugify(replace_turkish(item.title)) + + if not item.screenshot: + item.screenshot.name = "img/tema/openoffice-default.png" + item.save() + for tag in form.cleaned_data["tags"]: t = Tag.objects.get(name=tag) item.tags.add(t) item.slug = str(item.id) + "-" + slug - for version in form.cleaned_data["competible_with"]: - item.competible_with.add(version) - item.save() - - thumbnail = Image.open(item.screenshot.path) thumbnail.thumbnail((150,200), Image.ANTIALIAS) file = ContentFile("") From oi-svn at pardus.org.tr Sat Dec 4 17:34:02 2010 From: oi-svn at pardus.org.tr (=?utf-8?q?=C4=B0lker_Kesen?=) Date: Sat, 4 Dec 2010 17:34:02 +0200 (EET) Subject: [Oi-commits] trunk/tema - cosmetic changes Message-ID: <20101204153402.E27BA49C9F6@ns1.pardus.org.tr> Author: ilker Date: Sat Dec 4 17:34:02 2010 New Revision: 3595 Modified: trunk/tema/forms.py Log: cosmetic changes --- forms.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: trunk/tema/forms.py ================================================================= --- trunk/tema/forms.py (original) +++ trunk/tema/forms.py Sat Dec 4 17:34:02 2010 @@ -172,7 +172,7 @@ confirmation = forms.BooleanField(label="Onay", required=True, help_text="Bu OpenOffice.org eklentisini da??tma hakk?na sahibim.") license = forms.ModelChoiceField(label="Lisans", queryset=License.objects.order_by("name"), empty_label="---------") origin_url = forms.URLField(label="?zg?n ?al??ma", required=False, help_text="Ba?ka bir ?al??may? temel ald?ysan?z bunun ba?lant?s?n? yaz?n.", widget=forms.TextInput(attrs={"style":"width:400px"})) - + class Meta: model = OpenOfficeExtension exclude = ("author", "rating", "thumbnail", @@ -189,7 +189,7 @@ confirmation = forms.BooleanField(label="Onay", required=True, help_text="Bu tema setini da??tma hakk?na sahibim.") license = forms.ModelChoiceField(label="Lisans", queryset=License.objects.order_by("name"), empty_label="---------") origin_url = forms.URLField(label="?zg?n ?al??ma", required=False, help_text="Ba?ka bir ?al??may? temel ald?ysan?z bunun ba?lant?s?n? yaz?n.", widget=forms.TextInput(attrs={"style":"width:400px"})) - + class Meta: model = IconSet exclude = ("author", "rating", "thumbnail", From oi-svn at pardus.org.tr Sat Dec 4 17:36:55 2010 From: oi-svn at pardus.org.tr (=?utf-8?q?=C4=B0lker_Kesen?=) Date: Sat, 4 Dec 2010 17:36:55 +0200 (EET) Subject: [Oi-commits] trunk/tema - it is better Message-ID: <20101204153655.CF5A649C9F6@ns1.pardus.org.tr> Author: ilker Date: Sat Dec 4 17:36:55 2010 New Revision: 3596 Modified: trunk/tema/models.py Log: it is better --- models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: trunk/tema/models.py ================================================================= --- trunk/tema/models.py (original) +++ trunk/tema/models.py Sat Dec 4 17:36:55 2010 @@ -232,7 +232,7 @@ class OpenOfficeTheme(ThemeItem): file = models.FileField("OpenOffice dosyas?", upload_to="upload/tema/openoffice/%Y/%m/%d") - screenshot = models.ImageField("Ekran g?r?nt?s?", help_text="?ablonunuzun nas?l g?r?nd???ne dair bir ekran g?r?nt?n?z? burada payla??n", upload_to="upload/tema/openoffice/%Y/%m/%d",blank=True,null=True) + screenshot = models.ImageField("Ekran g?r?nt?s?", help_text="?ablonunuzun nas?l g?r?nd???ne dair bir ekran g?r?nt?s? varsa burada payla??n", upload_to="upload/tema/openoffice/%Y/%m/%d",blank=True,null=True) class Meta: verbose_name = "Open Office ?zelle?tirmesi" From oi-svn at pardus.org.tr Sat Dec 4 17:55:55 2010 From: oi-svn at pardus.org.tr (=?utf-8?q?=C4=B0lker_Kesen?=) Date: Sat, 4 Dec 2010 17:55:55 +0200 (EET) Subject: [Oi-commits] trunk/media/img - new picture Message-ID: <20101204155555.AEF2B49C9F6@ns1.pardus.org.tr> Author: ilker Date: Sat Dec 4 17:55:55 2010 New Revision: 3597 Modified: trunk/media/img/oi-edergi-kapak.png Log: new picture Modified: trunk/media/img/oi-edergi-kapak.png ================================================================= Binary files. No diff available. From oi-svn at pardus.org.tr Tue Dec 7 17:56:10 2010 From: oi-svn at pardus.org.tr (=?utf-8?q?=C4=B0lker_Kesen?=) Date: Tue, 7 Dec 2010 17:56:10 +0200 (EET) Subject: [Oi-commits] trunk/templates/tema - static page link added, users must obey the rules Message-ID: <20101207155610.8577D49C943@ns1.pardus.org.tr> Author: ilker Date: Tue Dec 7 17:56:10 2010 New Revision: 3598 Modified: trunk/templates/tema/themeitem_add_packagescreenshot.html Log: static page link added, users must obey the rules --- themeitem_add_packagescreenshot.html | 1 + 1 file changed, 1 insertion(+) Modified: trunk/templates/tema/themeitem_add_packagescreenshot.html ================================================================= --- trunk/templates/tema/themeitem_add_packagescreenshot.html (original) +++ trunk/templates/tema/themeitem_add_packagescreenshot.html Tue Dec 7 17:56:10 2010 @@ -8,6 +8,7 @@ {% endblock %} {% block content %}
+

Paket y?neticimizde g?r?nt?lenecek bu paket g?r?nt?lerini eklemeden ?nce burada bulunan kurallar? okuyup en do?ru ?ekilde g?rsellerinizi y?kleyebilirsiniz.


{{ form.non_field_errors }}

{% for field in form %} {% include "field.html" %} From oi-svn at pardus.org.tr Wed Dec 8 19:59:15 2010 From: oi-svn at pardus.org.tr (=?utf-8?q?=C4=B0lker_Kesen?=) Date: Wed, 8 Dec 2010 19:59:15 +0200 (EET) Subject: [Oi-commits] trunk/tema - preparing for openoffice category, it may not work... Message-ID: <20101208175916.061F749C9F2@ns1.pardus.org.tr> Author: ilker Date: Wed Dec 8 19:59:15 2010 New Revision: 3599 Modified: trunk/tema/admin.py trunk/tema/forms.py trunk/tema/models.py trunk/tema/urls.py trunk/tema/views.py Log: preparing for openoffice category, it may not work. my local database server is broken now, so i am going to work on the other computer. --- admin.py | 14 ++++---------- forms.py | 26 +++++--------------------- models.py | 53 +++++++++++++---------------------------------------- urls.py | 2 +- views.py | 54 +++++++++++++++++++----------------------------------- 5 files changed, 42 insertions(+), 107 deletions(-) Modified: trunk/tema/admin.py ================================================================= --- trunk/tema/admin.py (original) +++ trunk/tema/admin.py Wed Dec 8 19:59:15 2010 @@ -73,10 +73,7 @@ class IconSetAdmin(ThemeItemAdmin): list_display = ("title", "author", "license", "status") -class OpenOfficeTemplateAdmin(ThemeItemAdmin): - list_display = ("title", "version", "author", "license", "status") - -class OpenOfficeExtensionAdmin(ThemeItemAdmin): +class OpenOfficeThemeAdmin(ThemeItemAdmin): list_display = ("title", "version", "author", "license", "status") class PackageScreenshotAdmin(ThemeItemAdmin): @@ -85,7 +82,6 @@ class CategoryAdmin(admin.ModelAdmin): prepopulated_fields = {"slug": ("name",)} - admin.site.register(ThemeItem, ThemeItemAdmin) admin.site.register(Wallpaper, WallpaperAdmin) admin.site.register(DesktopScreenshot, DesktopScreenshotAdmin) @@ -93,10 +89,8 @@ admin.site.register(WallpaperFile, admin.ModelAdmin) admin.site.register(License, admin.ModelAdmin) admin.site.register(WallpaperCategory, CategoryAdmin) -admin.site.register(OpenOfficeTemplateCategory) -admin.site.register(OpenOfficeExtensionCategory) -admin.site.register(OpenOfficeTheme) -admin.site.register(OpenOfficeTemplate,OpenOfficeTemplateAdmin) -admin.site.register(OpenOfficeExtension, OpenOfficeExtensionAdmin) +admin.site.register(OpenOfficeThemeCategory) +admin.site.register(OpenOfficeTheme,OpenOfficeThemeAdmin) +admin.site.register(OpenOfficeThemeKind) admin.site.register(IconSet,IconSetAdmin) admin.site.register(PackageScreenshot, PackageScreenshotAdmin) Modified: trunk/tema/forms.py ================================================================= --- trunk/tema/forms.py (original) +++ trunk/tema/forms.py Wed Dec 8 19:59:15 2010 @@ -150,14 +150,14 @@ rating = forms.ChoiceField(choices=RATINGS) -class OpenOfficeTemplateForm(forms.ModelForm): - text = forms.CharField(label="Tan?m", required=True, help_text="Ekleyece?iniz ?ablon hakk?ndaki a??klamalar?n?z? bu b?l?mde belirtebilirsiniz.", widget=forms.Textarea(attrs={"style":"width:400px"})) - confirmation = forms.BooleanField(label="Onay", required=True, help_text="Bu OpenOffice.org ?ablonunu da??tma hakk?na sahibim.") +class OpenOfficeThemeForm(forms.ModelForm): + text = forms.CharField(label="Tan?m", required=True, help_text="Ekleyece?iniz ??e hakk?ndaki a??klamalar?n?z? bu b?l?mde belirtebilirsiniz.", widget=forms.Textarea(attrs={"style":"width:400px"})) + confirmation = forms.BooleanField(label="Onay", required=True, help_text="Bu OpenOffice.org ??esini da??tma hakk?na sahibim.") license = forms.ModelChoiceField(label="Lisans", queryset=License.objects.order_by("name"), empty_label="---------") origin_url = forms.URLField(label="?zg?n ?al??ma", required=False, help_text="Ba?ka bir ?al??may? temel ald?ysan?z bunun ba?lant?s?n? yaz?n.", widget=forms.TextInput(attrs={"style":"width:400px"})) class Meta: - model = OpenOfficeTemplate + model = OpenOfficeTheme exclude = ("author", "rating", "thumbnail", "download_count", "submit", "update", "status", "deny_reason", "scalable", "changelog", "slug", "topic", "version") @@ -167,24 +167,8 @@ raise forms.ValidationError("En fazla 5 etiket se?ebilirsiniz. L?tfen a?t???n?z ba?l??a uygun etiket se?iniz.") return field_data -class OpenOfficeExtensionForm(OpenOfficeTemplateForm): - text = forms.CharField(label="Tan?m", required=True, help_text="Ekleyece?iniz eklenti hakk?ndaki a??klamalar?n?z? bu b?l?mde belirtebilirsiniz.", widget=forms.Textarea(attrs={"style":"width:400px"})) - confirmation = forms.BooleanField(label="Onay", required=True, help_text="Bu OpenOffice.org eklentisini da??tma hakk?na sahibim.") - license = forms.ModelChoiceField(label="Lisans", queryset=License.objects.order_by("name"), empty_label="---------") - origin_url = forms.URLField(label="?zg?n ?al??ma", required=False, help_text="Ba?ka bir ?al??may? temel ald?ysan?z bunun ba?lant?s?n? yaz?n.", widget=forms.TextInput(attrs={"style":"width:400px"})) - - class Meta: - model = OpenOfficeExtension - exclude = ("author", "rating", "thumbnail", - "download_count", "submit", "update", "status", "deny_reason", "scalable", "changelog", "slug", "topic", "version") - - def clean_tags(self): - field_data = self.cleaned_data['tags'] - if len(field_data) > 5: - raise forms.ValidationError("En fazla 5 etiket se?ebilirsiniz. L?tfen a?t???n?z ba?l??a uygun etiket se?iniz.") - return field_data -class IconSetForm(OpenOfficeTemplateForm): +class IconSetForm(forms.ModelForm): text = forms.CharField(label="Tan?m", required=True, help_text="Ekleyece?iniz ikon seti hakk?ndaki a??klamalar?n?z?, kurulum ile ilgili ekstra notlar?n?z bu b?l?mde belirtebilirsiniz..", widget=forms.Textarea(attrs={"style":"width:400px"})) confirmation = forms.BooleanField(label="Onay", required=True, help_text="Bu tema setini da??tma hakk?na sahibim.") license = forms.ModelChoiceField(label="Lisans", queryset=License.objects.order_by("name"), empty_label="---------") Modified: trunk/tema/models.py ================================================================= --- trunk/tema/models.py (original) +++ trunk/tema/models.py Wed Dec 8 19:59:15 2010 @@ -70,21 +70,20 @@ class Meta: abstract = True +class OpenOfficeThemeKind(Category): + class Meta: + verbose_name = u"OpenOffice ??e T?r?" + verbose_name_plural = u"OpenOffice ??e T?rleri" class WallpaperCategory(Category): class Meta: verbose_name = u"Duvar Ka??d? Kategorisi" verbose_name_plural = u"Duvar Ka??d? Kategorileri" -class OpenOfficeTemplateCategory(Category): - class Meta: - verbose_name = u"Open Office ?ablon Kategorisi" - verbose_name_plural = u"Open Office ?ablon Kategorileri" - -class OpenOfficeExtensionCategory(Category): +class OpenOfficeThemeCategory(Category): class Meta: - verbose_name = u"Open Office Eklenti Kategorisi" - verbose_name_plural = u"Open Office Eklenti Kategorileri" + verbose_name = u"Open Office ??e Kategorisi" + verbose_name_plural = u"Open Office ??e Kategorileri" class ThemeItem(models.Model): "A theme item mainly consists of screenshots and files to download" @@ -233,48 +232,22 @@ class OpenOfficeTheme(ThemeItem): file = models.FileField("OpenOffice dosyas?", upload_to="upload/tema/openoffice/%Y/%m/%d") screenshot = models.ImageField("Ekran g?r?nt?s?", help_text="?ablonunuzun nas?l g?r?nd???ne dair bir ekran g?r?nt?s? varsa burada payla??n", upload_to="upload/tema/openoffice/%Y/%m/%d",blank=True,null=True) + kind = models.ForeignKey("OpenOfficeThemeKind", verbose_name="??e T?r?") + category = models.ForeignKey("OpenOfficeThemeCategory", verbose_name="Kategori") class Meta: - verbose_name = "Open Office ?zelle?tirmesi" - verbose_name_plural = "Open Office ?zelle?tirmeleri" - - def get_absolute_url(self): - if OpenOfficeTemplate.objects.filter(id = self.id).count(): - return "/tema/open-office-sablon/detay/%s/" % self.slug - elif OpenOfficeExtension.objects.filter(id = self.id).count(): - return "/tema/open-office-eklenti/detay/%s/" % self.slug - -class OpenOfficeTemplate(OpenOfficeTheme): - category = models.ForeignKey("OpenOfficeTemplateCategory",verbose_name="Kategori") - - class Meta: - verbose_name = u"Open Office ?ablonu" - verbose_name_plural = u"Open Office ?ablonlar?" + verbose_name = "Open Office ?zelle?tirmesi" + verbose_name_plural = "Open Office ?zelle?tirmeleri" def get_absolute_url(self): - return "/tema/open-office-sablon/detay/%s/" % (self.slug) + return "/tema/open-office-ogesi/detay/%s/" % (self.slug) def get_redirect_url(self): - return "/tema/open-office-sablon/detay/%s/%s/" % (self.slug, self.id) + return "/tema/open-office-ogesi/detay/%s/%s" % (self.slug, self.id) def get_download_url(self): return self.file.url -class OpenOfficeExtension(OpenOfficeTheme): - category = models.ForeignKey("OpenOfficeExtensionCategory") - - class Meta: - verbose_name = u"Open Office Eklentisi" - verbose_name_plural = u"Open Office Eklentileri" - - def get_absolute_url(self): - return "/tema/open-office-eklenti/detay/%s/" % (self.slug) - - def get_redirect_url(self): - return "/tema/open-office-eklenti/detay/%s/%s" % (self.slug, self.id) - - def get_download_url(self): - return self.file.url class Font(ThemeItem): font = models.FileField("Yaz?tipi dosyas?", upload_to="upload/tema/yazitipi/") Modified: trunk/tema/urls.py ================================================================= --- trunk/tema/urls.py (original) +++ trunk/tema/urls.py Wed Dec 8 19:59:15 2010 @@ -37,7 +37,7 @@ (r'^ekle/duvar-kagitlari/$','themeitem_add_wallpaper'), (r'^ekle/masaustu-goruntuleri/$','themeitem_add_desktopscreenshot'), (r'^ekle/yazitipleri/$','themeitem_add_font'), - (r'^ekle/open-office-ogesi/$','themeitem_add_openoffice_element'), + (r'^ekle/open-office-ogesi/$','themeitem_add_openofficetheme'), (r'^ekle/simge-seti/$','themeitem_add_iconset'), (r'^ekle/paket-goruntuleri/$', 'themeitem_add_packagescreenshot'), Modified: trunk/tema/views.py ================================================================= --- trunk/tema/views.py (original) +++ trunk/tema/views.py Wed Dec 8 19:59:15 2010 @@ -54,9 +54,7 @@ "duvar-kagitlari": (Wallpaper, "tema/themeitem_wallpaper_detail.html", WallpaperCategory), "masaustu-goruntuleri": (DesktopScreenshot, "tema/themeitem_desktopscreenshot_detail.html", None), "yazitipleri": (Font, "tema/themeitem_font_detail.html", None), - "open-office": (OpenOfficeTheme,"tema/themeitem_openofficetheme_detail.html",None), - "open-office-sablon": (OpenOfficeTemplate,"tema/themeitem_openofficetemplate_detail.html",OpenOfficeTemplateCategory), - "open-office-eklenti": (OpenOfficeExtension,"tema/themeitem_openofficeextension_detail.html",OpenOfficeExtensionCategory), + "open-office": (OpenOfficeTheme,"tema/themeitem_openofficetheme_detail.html", OpenOfficeThemeCategory), "simge-seti":(IconSet, "tema/themeitem_iconset_detail.html", None), "paket-goruntuleri": (PackageScreenshot, "tema/themeitem_packagescreenshot_detail.html", None), } @@ -74,8 +72,6 @@ add_new_links = {"duvar-kagitlari":"/tema/ekle/duvar-kagitlari", "yazitipleri":"/tema/ekle/yazitipleri", "open-office":"/tema/ekle/open-office-ogesi", - "open-office-eklenti":"/tema/ekle/open-office-ogesi", - "open-office-sablon":"/tema/ekle/open-office-ogesi", "simge-seti":"/tema/ekle/simge-seti", "masaustu-goruntuleri":"/tema/ekle/masaustu-goruntuleri/", "paket-goruntuleri":"/tema/ekle/paket-goruntuleri/", @@ -233,36 +229,31 @@ verbose_names = {"sablon":u"?ablon", "eklenti":u"Eklenti"} + @login_required -def themeitem_add_openoffice_element(request): - chosen = "" +def themeitem_add_openofficetheme(request): if request.method == "POST": - type = request.POST["type"] - chosen = {"name":type,"verbose_name":verbose_names[type]} - if type == "sablon": - form = OpenOfficeTemplateForm(request.POST,request.FILES) - template_form = form - extension_form = OpenOfficeExtensionForm() - elif type == "eklenti": - form = OpenOfficeExtensionForm(request.POST, request.FILES) - extension_form = form - template_form = OpenOfficeTemplateForm() - if form.is_valid(): + form = OpenOfficeThemeForm(request.POST.copy(), request.FILES) + flood, timeout = flood_control(request) + + if form.is_valid() and not flood: item = form.save(commit=False) item.author = request.user item.submit = item.update = datetime.datetime.now() slug = slugify(replace_turkish(item.title)) - + if not item.screenshot: - item.screenshot.name = "img/tema/openoffice-default.png" - + item.screenshot.name = "img/tema/openoffice-default.png" + item.save() - + for tag in form.cleaned_data["tags"]: - t = Tag.objects.get(name=tag) + t=Tag.objects.get(name=tag) item.tags.add(t) item.slug = str(item.id) + "-" + slug + item.save() + #create thumbnail thumbnail = Image.open(item.screenshot.path) thumbnail.thumbnail((150,200), Image.ANTIALIAS) file = ContentFile("") @@ -272,12 +263,9 @@ #TODO: Send e-mail to admins return render_response(request, "tema/themeitem_add_complete.html", locals()) else: - tags = [t.pk for t in Tag.objects.filter(name="openoffice.org ?ablonu")] - template_form = OpenOfficeTemplateForm(initial={"tags":tags}) - - tags = [t.pk for t in Tag.objects.filter(name="openoffice.org eklentisi")] - extension_form = OpenOfficeExtensionForm(initial={"tags":tags}) - return render_response(request,"tema/themeitem_add_openoffice_element.html",{"chosen":chosen,"extension_form":extension_form,"template_form":template_form}) + tags = [t.pk for t in Tag.objects.filter(name="openoffice ??esi")] + form = OpenOfficeThemeForm(initial={"tags":tags}) + return render_response(request, "tema/themeitem_add_openofficetheme.html", locals()) @login_required @@ -572,12 +560,8 @@ object = get_object_or_404(Font, id=id) object.download_count += 1 object.save() - elif category == "open-office-sablon": - object = get_object_or_404(OpenOfficeTemplate, id=id) - object.download_count += 1 - object.save() - elif category == "open-office-eklenti": - object = get_object_or_404(OpenOfficeExtension, id=id) + elif category == "open-office": + object = get_object_or_404(OpenOfficeTheme, id=id) object.download_count += 1 object.save() elif category == "paket-goruntuleri": From oi-svn at pardus.org.tr Wed Dec 8 20:00:28 2010 From: oi-svn at pardus.org.tr (=?utf-8?q?=C4=B0lker_Kesen?=) Date: Wed, 8 Dec 2010 20:00:28 +0200 (EET) Subject: [Oi-commits] trunk/templates/tema - preparing for openoffice category, it may not work... Message-ID: <20101208180028.CD13D49C9F2@ns1.pardus.org.tr> Author: ilker Date: Wed Dec 8 20:00:28 2010 New Revision: 3600 Added: trunk/templates/tema/themeitem_add_openofficetheme.html trunk/templates/tema/themeitem_openofficetheme_detail.html Removed: trunk/templates/tema/themeitem_add_openoffice_element.html trunk/templates/tema/themeitem_add_openoffice_extension.html trunk/templates/tema/themeitem_add_openoffice_template.html Log: preparing for openoffice category, it may not work. my local database server is broken now, so i am going to work on the other computer. --- themeitem_add_openoffice_element.html | 69 ---------------------------- themeitem_add_openoffice_extension.html | 24 --------- themeitem_add_openoffice_template.html | 24 --------- themeitem_add_openofficetheme.html | 24 +++++++++ themeitem_openofficetheme_detail.html | 78 ++++++++++++++++++++++++++++++++ 5 files changed, 102 insertions(+), 117 deletions(-) From oi-svn at pardus.org.tr Wed Dec 8 20:32:10 2010 From: oi-svn at pardus.org.tr (=?utf-8?q?=C4=B0lker_Kesen?=) Date: Wed, 8 Dec 2010 20:32:10 +0200 (EET) Subject: [Oi-commits] trunk/tema - little mistakes Message-ID: <20101208183210.D39DB49C90E@ns1.pardus.org.tr> Author: ilker Date: Wed Dec 8 20:32:10 2010 New Revision: 3601 Modified: trunk/tema/admin.py trunk/tema/models.py Log: little mistakes --- admin.py | 6 +++--- models.py | 14 ++++++-------- 2 files changed, 9 insertions(+), 11 deletions(-) Modified: trunk/tema/admin.py ================================================================= --- trunk/tema/admin.py (original) +++ trunk/tema/admin.py Wed Dec 8 20:32:10 2010 @@ -73,8 +73,8 @@ class IconSetAdmin(ThemeItemAdmin): list_display = ("title", "author", "license", "status") -class OpenOfficeThemeAdmin(ThemeItemAdmin): - list_display = ("title", "version", "author", "license", "status") + #class OpenOfficeThemeAdmin(ThemeItemAdmin): +# list_display = ("title", "version", "author", "license", "status") class PackageScreenshotAdmin(ThemeItemAdmin): list_display = ("title", "version", "author", "license", "status") @@ -90,7 +90,7 @@ admin.site.register(License, admin.ModelAdmin) admin.site.register(WallpaperCategory, CategoryAdmin) admin.site.register(OpenOfficeThemeCategory) -admin.site.register(OpenOfficeTheme,OpenOfficeThemeAdmin) +admin.site.register(OpenOfficeTheme) admin.site.register(OpenOfficeThemeKind) admin.site.register(IconSet,IconSetAdmin) admin.site.register(PackageScreenshot, PackageScreenshotAdmin) Modified: trunk/tema/models.py ================================================================= --- trunk/tema/models.py (original) +++ trunk/tema/models.py Wed Dec 8 20:32:10 2010 @@ -72,8 +72,8 @@ class OpenOfficeThemeKind(Category): class Meta: - verbose_name = u"OpenOffice ??e T?r?" - verbose_name_plural = u"OpenOffice ??e T?rleri" + verbose_name = "OpenOffice ??e T?r?" + verbose_name_plural = "OpenOffice ??e T?rleri" class WallpaperCategory(Category): class Meta: @@ -153,10 +153,8 @@ return "/tema/masaustu-goruntuleri/detay/%s/" % self.slug elif Font.objects.filter(id = self.id).count(): return "/tema/yazitipleri/detay/%s/" % self.slug - elif OpenOfficeTemplate.objects.filter(id = self.id).count(): - return "/tema/open-office-sablon/detay/%s/" % self.slug - elif OpenOfficeExtension.objects.filter(id = self.id).count(): - return "/tema/open-office-eklenti/detay/%s/" % self.slug + elif OpenOfficeThene.objects.filter(id = self.id).count(): + return "/tema/open-office-oge/detay/%s/" % self.slug elif IconSet.objects.filter(id = self.id).count(): return "/tema/simge-seti/detay/%s/" % self.slug elif PackageScreenshot.objects.filter(id= self.id).count(): @@ -243,7 +241,7 @@ return "/tema/open-office-ogesi/detay/%s/" % (self.slug) def get_redirect_url(self): - return "/tema/open-office-ogesi/detay/%s/%s" % (self.slug, self.id) + return "/tema/open-office-ogesi/detay/%s/%s/" % (self.slug, self.id) def get_download_url(self): return self.file.url @@ -411,6 +409,6 @@ category.count = Model.objects.filter(category=category,status=True).count() category.save() -for Model in [Wallpaper,OpenOfficeTemplate, OpenOfficeExtension]: +for Model in [Wallpaper,OpenOfficeTheme]: post_save.connect(category_counter_callback, sender=Model) post_delete.connect(category_counter_callback, sender=Model) From oi-svn at pardus.org.tr Thu Dec 9 17:11:37 2010 From: oi-svn at pardus.org.tr (=?utf-8?q?=C4=B0lker_Kesen?=) Date: Thu, 9 Dec 2010 17:11:37 +0200 (EET) Subject: [Oi-commits] trunk/tema - my little stupid mistake, i have just fixed it Message-ID: <20101209151137.7578949C93F@ns1.pardus.org.tr> Author: ilker Date: Thu Dec 9 17:11:37 2010 New Revision: 3602 Modified: trunk/tema/models.py Log: my little stupid mistake, i have just fixed it --- models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: trunk/tema/models.py ================================================================= --- trunk/tema/models.py (original) +++ trunk/tema/models.py Thu Dec 9 17:11:37 2010 @@ -153,7 +153,7 @@ return "/tema/masaustu-goruntuleri/detay/%s/" % self.slug elif Font.objects.filter(id = self.id).count(): return "/tema/yazitipleri/detay/%s/" % self.slug - elif OpenOfficeThene.objects.filter(id = self.id).count(): + elif OpenOfficeTheme.objects.filter(id = self.id).count(): return "/tema/open-office-oge/detay/%s/" % self.slug elif IconSet.objects.filter(id = self.id).count(): return "/tema/simge-seti/detay/%s/" % self.slug From oi-svn at pardus.org.tr Thu Dec 9 17:53:09 2010 From: oi-svn at pardus.org.tr (=?utf-8?b?R8O2a21lbiBHw7ZyZ2Vu?=) Date: Thu, 9 Dec 2010 17:53:09 +0200 (EET) Subject: [Oi-commits] trunk/scripts - small changes. update episode number. Message-ID: <20101209155309.2F94C49C93F@ns1.pardus.org.tr> Author: gkmngrgn Date: Thu Dec 9 17:53:08 2010 New Revision: 3603 Modified: trunk/scripts/calc_downloads.py Log: small changes. update episode number. --- calc_downloads.py | 44 ++++++++++++++++++++++++++++++++++++++------ 1 file changed, 38 insertions(+), 6 deletions(-) Modified: trunk/scripts/calc_downloads.py ================================================================= --- trunk/scripts/calc_downloads.py (original) +++ trunk/scripts/calc_downloads.py Thu Dec 9 17:53:08 2010 @@ -2,14 +2,46 @@ # -*- coding: utf-8 -*- # important command: sed -i "s|op_podcast|oi_podcast|g" oi_podcast.log +# +# Important Notes: +# - First ejournal file names: edergi_200804_300dpi.pdf & edergi_200804_96dpi.pdf +# - 10th podcast names start with op_podcast +# - In podcast name, character "E" may be small. +# |--> podcast 35 +# |--> podcast 36 +# |--> podcast 40 +# +# - In podcast name, character "_" may be "-". +# |--> podcast 26: oi-podcast-E26 +# +# - In podcast name, it may be end with _N. +# |--> podcast 28: oi_podcast_E28_1 +# +# Total of old logs: +# | +# |--> Podcast +# | | +# | |--> nginx => +# | | +# | |--> apache => +# | | +# | |--> total => +# | +# |--> Ejournal +# | +# |--> nginx => +# | +# |--> apache => +# | +# |--> total => +# import re -LOGPODCAST = "oi_podcast.log" +LOGPODCAST = "podcast.log" LOGEDERGI = "edergi.log" -EPISODELISTPODCAST = range(1, 18) -EPISODELISTEDERGI = range(1, 23) - +COUNT_OF_PODCAST = 40 +COUNT_OF_JOURNAL = 28 def get_amount_list(log_file, regex): log_list = file(log_file).readlines() @@ -34,7 +66,7 @@ # podcasts amount_list = get_amount_list(LOGPODCAST, regex_podcast) - for episode in EPISODELISTPODCAST: + for episode in range(1, COUNT_OF_PODCAST + 1): if episode < 10: # dirty hacking episode = "0%s" % episode amount_ogg = amount_list.count('%s.ogg' % episode) @@ -46,7 +78,7 @@ # edergis amount_list = get_amount_list(LOGEDERGI, regex_edergi) - for episode in EPISODELISTEDERGI: + for episode in range(1, COUNT_OF_JOURNAL + 1): if episode < 10: # still dirty hacking episode = "0%s" % episode amount_buyuk = amount_list.count('%s_buyuk.pdf' % episode) From oi-svn at pardus.org.tr Fri Dec 10 03:06:39 2010 From: oi-svn at pardus.org.tr (=?utf-8?q?=C4=B0lker_Kesen?=) Date: Fri, 10 Dec 2010 03:06:39 +0200 (EET) Subject: [Oi-commits] trunk/templates/tema - we do not need it Message-ID: <20101210010640.53B3A49D581@ns1.pardus.org.tr> Author: ilker Date: Fri Dec 10 03:06:39 2010 New Revision: 3604 Removed: trunk/templates/tema/themeitem_openofficetemplate_detail.html Log: we do not need it --- themeitem_openofficetemplate_detail.html | 79 ------------------------------- 1 file changed, 79 deletions(-) From oi-svn at pardus.org.tr Fri Dec 10 03:07:44 2010 From: oi-svn at pardus.org.tr (=?utf-8?q?=C4=B0lker_Kesen?=) Date: Fri, 10 Dec 2010 03:07:44 +0200 (EET) Subject: trunk/tema - fixes detail page problem, thanks gökmen Message-ID: <20101210010744.EDEF149D581@ns1.pardus.org.tr> Author: ilker Date: Fri Dec 10 03:07:44 2010 New Revision: 3605 Modified: trunk/tema/models.py trunk/tema/urls.py trunk/tema/views.py Log: fixes detail page problem, thanks g?kmen --- models.py | 4 ++-- urls.py | 2 +- views.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) Modified: trunk/tema/models.py ================================================================= --- trunk/tema/models.py (original) +++ trunk/tema/models.py Fri Dec 10 03:07:44 2010 @@ -238,10 +238,10 @@ verbose_name_plural = "Open Office ?zelle?tirmeleri" def get_absolute_url(self): - return "/tema/open-office-ogesi/detay/%s/" % (self.slug) + return "/tema/open-office/detay/%s/" % (self.slug) def get_redirect_url(self): - return "/tema/open-office-ogesi/detay/%s/%s/" % (self.slug, self.id) + return "/tema/open-office/detay/%s/%s/" % (self.slug, self.id) def get_download_url(self): return self.file.url Modified: trunk/tema/urls.py ================================================================= --- trunk/tema/urls.py (original) +++ trunk/tema/urls.py Fri Dec 10 03:07:44 2010 @@ -37,7 +37,7 @@ (r'^ekle/duvar-kagitlari/$','themeitem_add_wallpaper'), (r'^ekle/masaustu-goruntuleri/$','themeitem_add_desktopscreenshot'), (r'^ekle/yazitipleri/$','themeitem_add_font'), - (r'^ekle/open-office-ogesi/$','themeitem_add_openofficetheme'), + (r'^ekle/open-office/$','themeitem_add_openofficetheme'), (r'^ekle/simge-seti/$','themeitem_add_iconset'), (r'^ekle/paket-goruntuleri/$', 'themeitem_add_packagescreenshot'), Modified: trunk/tema/views.py ================================================================= --- trunk/tema/views.py (original) +++ trunk/tema/views.py Fri Dec 10 03:07:44 2010 @@ -71,7 +71,7 @@ add_new_links = {"duvar-kagitlari":"/tema/ekle/duvar-kagitlari", "yazitipleri":"/tema/ekle/yazitipleri", - "open-office":"/tema/ekle/open-office-ogesi", + "open-office":"/tema/ekle/open-office", "simge-seti":"/tema/ekle/simge-seti", "masaustu-goruntuleri":"/tema/ekle/masaustu-goruntuleri/", "paket-goruntuleri":"/tema/ekle/paket-goruntuleri/", From oi-svn at pardus.org.tr Fri Dec 10 18:58:35 2010 From: oi-svn at pardus.org.tr (=?utf-8?q?=C4=B0lker_Kesen?=) Date: Fri, 10 Dec 2010 18:58:35 +0200 (EET) Subject: [Oi-commits] trunk/media/js - grappelli is compatible with jquery-1.4.2, prepari... Message-ID: <20101210165837.125F649C9F6@ns1.pardus.org.tr> Author: ilker Date: Fri Dec 10 18:58:33 2010 New Revision: 3606 Added: trunk/media/js/jquery-1.4.2.min.js Removed: trunk/media/js/jquery-1.4.3.min.js Log: grappelli is compatible with jquery-1.4.2, preparing for autocomplete --- jquery-1.4.2.min.js | 154 ++++++++++++++++++++++++++++++++++++++++++++++++ jquery-1.4.3.min.js | 166 ---------------------------------------------------- 2 files changed, 154 insertions(+), 166 deletions(-) From oi-svn at pardus.org.tr Fri Dec 10 19:00:11 2010 From: oi-svn at pardus.org.tr (=?utf-8?q?=C4=B0lker_Kesen?=) Date: Fri, 10 Dec 2010 19:00:11 +0200 (EET) Subject: [Oi-commits] trunk - now autocomplete works Message-ID: <20101210170011.E2EDB49D59A@ns1.pardus.org.tr> Author: ilker Date: Fri Dec 10 19:00:11 2010 New Revision: 3607 Modified: trunk/ezine/admin.py trunk/grappelli/templates/admin/change_form.html trunk/podcast/admin.py trunk/st/admin.py trunk/tema/admin.py Log: now autocomplete works --- ezine/admin.py | 2 +- grappelli/templates/admin/change_form.html | 8 ++++++++ podcast/admin.py | 4 ++-- st/admin.py | 4 ++-- tema/admin.py | 4 ++-- 5 files changed, 15 insertions(+), 7 deletions(-) Modified: trunk/ezine/admin.py ================================================================= --- trunk/ezine/admin.py (original) +++ trunk/ezine/admin.py Fri Dec 10 19:00:11 2010 @@ -16,6 +16,6 @@ class Media: js = ( 'admin/tinymce/jscripts/tiny_mce/tiny_mce.js', - 'js/jquery-1.4.3.min.js', 'js/adminimages.js', 'js/tinymce_setup.js') + 'js/jquery-1.4.2.min.js', 'js/adminimages.js', 'js/tinymce_setup.js') admin.site.register(Ezine, EzineAdmin) Modified: trunk/grappelli/templates/admin/change_form.html ================================================================= --- trunk/grappelli/templates/admin/change_form.html (original) +++ trunk/grappelli/templates/admin/change_form.html Fri Dec 10 19:00:11 2010 @@ -12,6 +12,14 @@ + + {% endblock %} Modified: trunk/podcast/admin.py ================================================================= --- trunk/podcast/admin.py (original) +++ trunk/podcast/admin.py Fri Dec 10 19:00:11 2010 @@ -12,9 +12,9 @@ class EpisodeAdmin(admin.ModelAdmin): exclude = ("topic", "minutes", "seconds") class Media: - js = ("admin/tinymce/jscripts/tiny_mce/tiny_mce.js", "js/tinymce_setup.js", "js/jquery-1.4.3.min.js", "js/adminimages.js", "js/jquery.autocomplete.js", "js/taghelper.js") + js = ("admin/tinymce/jscripts/tiny_mce/tiny_mce.js", "js/tinymce_setup.js", "js/jquery-1.4.2.min.js", "js/adminimages.js", "js/jquery.autocomplete.js", "js/taghelper.js") css = { - "all": ("css/new/autocomplete.css",), + "all": ("media/admin/css/jquery-ui-grappelli-extensions.css",), } admin.site.register(Author) Modified: trunk/st/admin.py ================================================================= --- trunk/st/admin.py (original) +++ trunk/st/admin.py Fri Dec 10 19:00:11 2010 @@ -28,9 +28,9 @@ prepopulated_fields = {'slug': ("title",)} class Media: - js = ("admin/tinymce/jscripts/tiny_mce/tiny_mce.js", "js/tinymce_setup.js", "js/jquery-1.4.3.min.js", "js/adminimages.js", "js/jquery.autocomplete.js", "js/taghelper.js") + js = ("admin/tinymce/jscripts/tiny_mce/tiny_mce.js", "js/tinymce_setup.js", "js/jquery-1.4.2.min.js", "js/adminimages.js", "js/jquery.autocomplete.js", "js/taghelper.js") css = { - "all": ("css/new/autocomplete.css",), + "all": ("media/admin/css/jquery-ui-grappelli-extensions.css",), } class FSAdmin(ArticleAdmin): Modified: trunk/tema/admin.py ================================================================= --- trunk/tema/admin.py (original) +++ trunk/tema/admin.py Fri Dec 10 19:00:11 2010 @@ -25,9 +25,9 @@ search_fields = ["title", "text", "changelog"] class Media: - js = ("js/jquery-1.4.3.min.js", "js/temaimages.js", "js/jquery.autocomplete.js", "js/taghelper.js") + js = ("js/jquery-1.4.2.min.js", "js/temaimages.js", "js/jquery.autocomplete.js", "js/taghelper.js") css = { - "all": ("css/new/autocomplete.css",), + "all": ("media/admin/css/jquery-ui-grappelli-extensions.css",), } class WallpaperAdmin(ThemeItemAdmin): From oi-svn at pardus.org.tr Fri Dec 10 19:00:31 2010 From: oi-svn at pardus.org.tr (=?utf-8?q?=C4=B0lker_Kesen?=) Date: Fri, 10 Dec 2010 19:00:31 +0200 (EET) Subject: [Oi-commits] trunk/grappelli - cosmetic changes Message-ID: <20101210170031.620C349D59A@ns1.pardus.org.tr> Author: ilker Date: Fri Dec 10 19:00:30 2010 New Revision: 3608 Modified: trunk/grappelli/admin.py Log: cosmetic changes --- admin.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) Modified: trunk/grappelli/admin.py ================================================================= --- trunk/grappelli/admin.py (original) +++ trunk/grappelli/admin.py Fri Dec 10 19:00:30 2010 @@ -14,12 +14,12 @@ class AdminSite(sites.AdminSite): - + def __init__(self, *args, **kwargs): self.grappelli_title = kwargs.pop('title', 'Grappelli') self.grappelli_headline = kwargs.pop('headline', 'Grappelli') super(AdminSite, self).__init__(*args, **kwargs) - + def annotate_context(self, extra_context): extra_context = extra_context or {} extra_context.update({ @@ -27,7 +27,7 @@ 'grappelli_admin_headline': self.grappelli_headline, }) return extra_context - + def admin_view(self, view, cacheable=False): # not everything can take extra_context excludes = [ @@ -56,7 +56,7 @@ class RelatedLookupAdmin(admin.ModelAdmin): - + def has_change_permission(self, request, obj=None): if not obj: opts = self.opts From oi-svn at pardus.org.tr Sat Dec 11 20:34:27 2010 From: oi-svn at pardus.org.tr (=?utf-8?q?=C4=B0lker_Kesen?=) Date: Sat, 11 Dec 2010 20:34:27 +0200 (EET) Subject: [Oi-commits] trunk/media/css/new - autocomplete.css for grappelli Message-ID: <20101211183427.2B22649C8B9@ns1.pardus.org.tr> Author: ilker Date: Sat Dec 11 20:34:26 2010 New Revision: 3609 Added: trunk/media/css/new/grappelli.autocomplete.css Log: autocomplete.css for grappelli --- grappelli.autocomplete.css | 70 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) From oi-svn at pardus.org.tr Sat Dec 11 20:35:28 2010 From: oi-svn at pardus.org.tr (=?utf-8?q?=C4=B0lker_Kesen?=) Date: Sat, 11 Dec 2010 20:35:28 +0200 (EET) Subject: [Oi-commits] trunk - new style, it is better Message-ID: <20101211183528.8136B49C8B9@ns1.pardus.org.tr> Author: ilker Date: Sat Dec 11 20:35:28 2010 New Revision: 3610 Modified: trunk/podcast/admin.py trunk/st/admin.py trunk/tema/admin.py Log: new style, it is better --- podcast/admin.py | 2 +- st/admin.py | 2 +- tema/admin.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) Modified: trunk/podcast/admin.py ================================================================= --- trunk/podcast/admin.py (original) +++ trunk/podcast/admin.py Sat Dec 11 20:35:28 2010 @@ -14,7 +14,7 @@ class Media: js = ("admin/tinymce/jscripts/tiny_mce/tiny_mce.js", "js/tinymce_setup.js", "js/jquery-1.4.2.min.js", "js/adminimages.js", "js/jquery.autocomplete.js", "js/taghelper.js") css = { - "all": ("media/admin/css/jquery-ui-grappelli-extensions.css",), + "all": ("css/new/grappelli.autocomplete.css",), } admin.site.register(Author) Modified: trunk/st/admin.py ================================================================= --- trunk/st/admin.py (original) +++ trunk/st/admin.py Sat Dec 11 20:35:28 2010 @@ -30,7 +30,7 @@ class Media: js = ("admin/tinymce/jscripts/tiny_mce/tiny_mce.js", "js/tinymce_setup.js", "js/jquery-1.4.2.min.js", "js/adminimages.js", "js/jquery.autocomplete.js", "js/taghelper.js") css = { - "all": ("media/admin/css/jquery-ui-grappelli-extensions.css",), + "all": ("css/new/grappelli.autocomplete.css",), } class FSAdmin(ArticleAdmin): Modified: trunk/tema/admin.py ================================================================= --- trunk/tema/admin.py (original) +++ trunk/tema/admin.py Sat Dec 11 20:35:28 2010 @@ -27,7 +27,7 @@ class Media: js = ("js/jquery-1.4.2.min.js", "js/temaimages.js", "js/jquery.autocomplete.js", "js/taghelper.js") css = { - "all": ("media/admin/css/jquery-ui-grappelli-extensions.css",), + "all": ("css/new/grappelli.autocomplete.css",), } class WallpaperAdmin(ThemeItemAdmin): From oi-svn at pardus.org.tr Sat Dec 11 20:38:11 2010 From: oi-svn at pardus.org.tr (=?utf-8?q?=C4=B0lker_Kesen?=) Date: Sat, 11 Dec 2010 20:38:11 +0200 (EET) Subject: [Oi-commits] trunk/tema - cosmetic changes Message-ID: <20101211183811.7EF7A49C8B9@ns1.pardus.org.tr> Author: ilker Date: Sat Dec 11 20:38:11 2010 New Revision: 3611 Modified: trunk/tema/views.py Log: cosmetic changes --- views.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) Modified: trunk/tema/views.py ================================================================= --- trunk/tema/views.py (original) +++ trunk/tema/views.py Sat Dec 11 20:38:11 2010 @@ -11,7 +11,7 @@ from oi.forum.views import flood_control from oi.st.wrappers import render_response -from oi.tema.models import ThemeItem, File, ScreenShot, Vote, ThemeAbuseReport, DesktopScreenshot, Wallpaper, Font, PackageScreenshot +from oi.tema.models import ThemeItem, File, ScreenShot, Vote, ThemeAbuseReport, DesktopScreenshot, Wallpaper, Font, PackageScreenshot, OpenOfficeTheme from oi.tema.forms import * from oi.tema.settings import THEME_ITEM_PER_PAGE @@ -241,12 +241,12 @@ item.author = request.user item.submit = item.update = datetime.datetime.now() slug = slugify(replace_turkish(item.title)) - + if not item.screenshot: - item.screenshot.name = "img/tema/openoffice-default.png" - + item.screenshot.name = "img/tema/openoffice-default.png" + item.save() - + for tag in form.cleaned_data["tags"]: t=Tag.objects.get(name=tag) item.tags.add(t) @@ -285,7 +285,7 @@ item.tags.add(t) item.slug = str(item.id) + "-" + slug - + #create thumbnail thumbnail = Image.open(item.screenshot.path) thumbnail.thumbnail((150,200), Image.ANTIALIAS) file = ContentFile("") From oi-svn at pardus.org.tr Sat Dec 11 20:38:55 2010 From: oi-svn at pardus.org.tr (=?utf-8?q?=C4=B0lker_Kesen?=) Date: Sat, 11 Dec 2010 20:38:55 +0200 (EET) Subject: [Oi-commits] trunk/tema - little bugs fixed Message-ID: <20101211183855.2542B49C8B9@ns1.pardus.org.tr> Author: ilker Date: Sat Dec 11 20:38:55 2010 New Revision: 3612 Modified: trunk/tema/models.py Log: little bugs fixed --- models.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) Modified: trunk/tema/models.py ================================================================= --- trunk/tema/models.py (original) +++ trunk/tema/models.py Sat Dec 11 20:38:55 2010 @@ -22,8 +22,11 @@ CATEGORIES = ( ("duvar-kagitlari", "Duvar Ka??tlar?"), - ("masaustu-goruntuleri", "Ekran G?r?nt?leri"), + ("simge-seti", "Simge Setleri"), ("yazitipleri", "Yaz?tipleri"), + ("open-office", "OpenOffice.org ??eleri"), + ("masaustu-goruntuleri", "Ekran G?r?nt?leri"), + ("paket-goruntuleri", "Paket G?r?nt?leri"), ) class WallPaperSize: @@ -154,7 +157,7 @@ elif Font.objects.filter(id = self.id).count(): return "/tema/yazitipleri/detay/%s/" % self.slug elif OpenOfficeTheme.objects.filter(id = self.id).count(): - return "/tema/open-office-oge/detay/%s/" % self.slug + return "/tema/open-office/detay/%s/" % self.slug elif IconSet.objects.filter(id = self.id).count(): return "/tema/simge-seti/detay/%s/" % self.slug elif PackageScreenshot.objects.filter(id= self.id).count(): From oi-svn at pardus.org.tr Sat Dec 11 20:44:19 2010 From: oi-svn at pardus.org.tr (=?utf-8?q?=C4=B0lker_Kesen?=) Date: Sat, 11 Dec 2010 20:44:19 +0200 (EET) Subject: [Oi-commits] trunk - order by rating list also exists on the top menu, ... Message-ID: <20101211184419.2AE2849C8B9@ns1.pardus.org.tr> Author: ilker Date: Sat Dec 11 20:44:19 2010 New Revision: 3613 Removed: trunk/templates/tema/sidebar.html Modified: trunk/tema/templatetags/tema.py trunk/templates/tema/base.html Log: order by rating list also exists on the top menu, remove it from sidebar --- tema/templatetags/tema.py | 19 +------------------ templates/tema/base.html | 8 -------- templates/tema/sidebar.html | 8 -------- 3 files changed, 1 insertion(+), 34 deletions(-) Modified: trunk/tema/templatetags/tema.py ================================================================= --- trunk/tema/templatetags/tema.py (original) +++ trunk/tema/templatetags/tema.py Sat Dec 11 20:44:19 2010 @@ -7,27 +7,10 @@ from django import template from django.template import Context, loader -from oi.tema.models import ThemeItem, ThemeAbuseReport, DesktopScreenshot, Wallpaper, Font +from oi.tema.models import ThemeAbuseReport register = template.Library() @register.simple_tag def number_of_theme_abuse(): return ThemeAbuseReport.objects.count() - - at register.simple_tag -def top_content(category=None): - if category == "duvar-kagitlari": - object_list = Wallpaper.objects.all() - title = "En Be?enilen Duvar Ka??tlar?" - elif category == "masaustu-goruntuleri": - object_list = DesktopScreenshot.objects.all() - title = "En Be?enilen Masa?stleri" - elif category == "yazitipleri": - object_list = Font.objects.all() - title = "En Be?enilen Yaz?tipleri" - else: - object_list = ThemeItem.objects.all() - title = "En ?ok Be?enilenler" - object_list = object_list.filter(status=True).order_by("-rating", "-update")[:10] - return loader.get_template("tema/sidebar.html").render(Context({"object_list":object_list,"title":title})) Modified: trunk/templates/tema/base.html ================================================================= --- trunk/templates/tema/base.html (original) +++ trunk/templates/tema/base.html Sat Dec 11 20:44:19 2010 @@ -41,14 +41,6 @@ {% endif %} - - - - {% if category %} - {% top_content category %} - {% else %} - {% top_content %} - {% endif %} {% endblock %} From oi-svn at pardus.org.tr Tue Dec 14 18:05:17 2010 From: oi-svn at pardus.org.tr (=?utf-8?q?=C4=B0lker_Kesen?=) Date: Tue, 14 Dec 2010 18:05:17 +0200 (EET) Subject: [Oi-commits] trunk - eliminate kind class, it is useless Message-ID: <20101214160517.38F9E49C90E@ns1.pardus.org.tr> Author: ilker Date: Tue Dec 14 18:05:16 2010 New Revision: 3614 Modified: trunk/tema/admin.py trunk/tema/models.py trunk/templates/tema/themeitem_openofficetheme_detail.html Log: eliminate kind class, it is useless --- tema/admin.py | 1 - tema/models.py | 6 ------ templates/tema/themeitem_openofficetheme_detail.html | 1 - 3 files changed, 8 deletions(-) Modified: trunk/tema/admin.py ================================================================= --- trunk/tema/admin.py (original) +++ trunk/tema/admin.py Tue Dec 14 18:05:16 2010 @@ -91,6 +91,5 @@ admin.site.register(WallpaperCategory, CategoryAdmin) admin.site.register(OpenOfficeThemeCategory) admin.site.register(OpenOfficeTheme) -admin.site.register(OpenOfficeThemeKind) admin.site.register(IconSet,IconSetAdmin) admin.site.register(PackageScreenshot, PackageScreenshotAdmin) Modified: trunk/tema/models.py ================================================================= --- trunk/tema/models.py (original) +++ trunk/tema/models.py Tue Dec 14 18:05:16 2010 @@ -73,11 +73,6 @@ class Meta: abstract = True -class OpenOfficeThemeKind(Category): - class Meta: - verbose_name = "OpenOffice ??e T?r?" - verbose_name_plural = "OpenOffice ??e T?rleri" - class WallpaperCategory(Category): class Meta: verbose_name = u"Duvar Ka??d? Kategorisi" @@ -233,7 +228,6 @@ class OpenOfficeTheme(ThemeItem): file = models.FileField("OpenOffice dosyas?", upload_to="upload/tema/openoffice/%Y/%m/%d") screenshot = models.ImageField("Ekran g?r?nt?s?", help_text="?ablonunuzun nas?l g?r?nd???ne dair bir ekran g?r?nt?s? varsa burada payla??n", upload_to="upload/tema/openoffice/%Y/%m/%d",blank=True,null=True) - kind = models.ForeignKey("OpenOfficeThemeKind", verbose_name="??e T?r?") category = models.ForeignKey("OpenOfficeThemeCategory", verbose_name="Kategori") class Meta: Modified: trunk/templates/tema/themeitem_openofficetheme_detail.html ================================================================= --- trunk/templates/tema/themeitem_openofficetheme_detail.html (original) +++ trunk/templates/tema/themeitem_openofficetheme_detail.html Tue Dec 14 18:05:16 2010 @@ -50,7 +50,6 @@ Lisans: {{ object.license.name }}
G?nderildi?i Tarih: {{ object.submit|date:"d F Y" }}
?ndirilme Say?s?: {{ object.download_count }}
- ??e T?r?: {{ object.kind.name.title }}
Kategori: {{object.category.name.title}}
{% if object.origin_url %}?zg?n ?al??ma
{% endif %}
From oi-svn at pardus.org.tr Tue Dec 14 18:05:38 2010 From: oi-svn at pardus.org.tr (=?utf-8?q?=C4=B0lker_Kesen?=) Date: Tue, 14 Dec 2010 18:05:38 +0200 (EET) Subject: [Oi-commits] trunk/templates/tema - fix broken link Message-ID: <20101214160538.88FB749C90E@ns1.pardus.org.tr> Author: ilker Date: Tue Dec 14 18:05:38 2010 New Revision: 3615 Modified: trunk/templates/tema/themeitem_welcome.html Log: fix broken link --- themeitem_welcome.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: trunk/templates/tema/themeitem_welcome.html ================================================================= --- trunk/templates/tema/themeitem_welcome.html (original) +++ trunk/templates/tema/themeitem_welcome.html Tue Dec 14 18:05:38 2010 @@ -73,7 +73,7 @@ - +
From oi-svn at pardus.org.tr Tue Dec 14 18:52:53 2010 From: oi-svn at pardus.org.tr (=?utf-8?q?=C4=B0lker_Kesen?=) Date: Tue, 14 Dec 2010 18:52:53 +0200 (EET) Subject: [Oi-commits] trunk/templates/tema - eliminate kind class from base template, it does n... Message-ID: <20101214165254.03EFC49C90E@ns1.pardus.org.tr> Author: ilker Date: Tue Dec 14 18:52:53 2010 New Revision: 3616 Modified: trunk/templates/tema/base.html Log: eliminate kind class from base template, it does not exist --- base.html | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) Modified: trunk/templates/tema/base.html ================================================================= --- trunk/templates/tema/base.html (original) +++ trunk/templates/tema/base.html Tue Dec 14 18:52:53 2010 @@ -22,14 +22,7 @@ {% if perms.tema.change_themeabusereport %}
  • Tema ?ikayetleri ({% number_of_theme_abuse %})
    • {% endif %}
  • - {% if open_office %} - - {% endif %} + {% if sub_categories %} From oi-svn at pardus.org.tr Wed Dec 15 16:48:20 2010 From: oi-svn at pardus.org.tr (=?utf-8?b?R8O2a21lbiBHw7ZyZ2Vu?=) Date: Wed, 15 Dec 2010 16:48:20 +0200 (EET) Subject: [Oi-commits] trunk/filebrowser - filebrowser added. Message-ID: <20101215144821.1F11449CC76@ns1.pardus.org.tr> Author: gkmngrgn Date: Wed Dec 15 16:48:20 2010 New Revision: 3618 Added: trunk/filebrowser/ trunk/filebrowser/LICENSE trunk/filebrowser/__init__.py trunk/filebrowser/base.py trunk/filebrowser/decorators.py trunk/filebrowser/fields.py trunk/filebrowser/forms.py trunk/filebrowser/functions.py (contents, props changed) trunk/filebrowser/locale/ trunk/filebrowser/locale/ca/ trunk/filebrowser/locale/ca/LC_MESSAGES/ trunk/filebrowser/locale/ca/LC_MESSAGES/django.mo (contents, props changed) trunk/filebrowser/locale/ca/LC_MESSAGES/django.po trunk/filebrowser/locale/de/ trunk/filebrowser/locale/de/LC_MESSAGES/ trunk/filebrowser/locale/de/LC_MESSAGES/django.mo (contents, props changed) trunk/filebrowser/locale/de/LC_MESSAGES/django.po trunk/filebrowser/locale/es/ trunk/filebrowser/locale/es/LC_MESSAGES/ trunk/filebrowser/locale/es/LC_MESSAGES/django.mo (contents, props changed) trunk/filebrowser/locale/es/LC_MESSAGES/django.po trunk/filebrowser/locale/fr/ trunk/filebrowser/locale/fr/LC_MESSAGES/ trunk/filebrowser/locale/fr/LC_MESSAGES/django.mo (contents, props changed) trunk/filebrowser/locale/fr/LC_MESSAGES/django.po trunk/filebrowser/locale/it/ trunk/filebrowser/locale/it/LC_MESSAGES/ trunk/filebrowser/locale/it/LC_MESSAGES/django.mo (contents, props changed) trunk/filebrowser/locale/it/LC_MESSAGES/django.po trunk/filebrowser/locale/nl/ trunk/filebrowser/locale/nl/LC_MESSAGES/ trunk/filebrowser/locale/nl/LC_MESSAGES/django.mo (contents, props changed) trunk/filebrowser/locale/nl/LC_MESSAGES/django.po trunk/filebrowser/locale/ru/ trunk/filebrowser/locale/ru/LC_MESSAGES/ trunk/filebrowser/locale/ru/LC_MESSAGES/django.mo (contents, props changed) trunk/filebrowser/locale/ru/LC_MESSAGES/django.po trunk/filebrowser/locale/sr/ trunk/filebrowser/locale/sr/LC_MESSAGES/ trunk/filebrowser/locale/sr/LC_MESSAGES/django.mo (contents, props changed) trunk/filebrowser/locale/sr/LC_MESSAGES/django.po trunk/filebrowser/locale/sr_Latn/ trunk/filebrowser/locale/sr_Latn/LC_MESSAGES/ trunk/filebrowser/locale/sr_Latn/LC_MESSAGES/django.mo (contents, props changed) trunk/filebrowser/locale/sr_Latn/LC_MESSAGES/django.po trunk/filebrowser/locale/zh_CN/ trunk/filebrowser/locale/zh_CN/LC_MESSAGES/ trunk/filebrowser/locale/zh_CN/LC_MESSAGES/django.mo (contents, props changed) trunk/filebrowser/locale/zh_CN/LC_MESSAGES/django.po trunk/filebrowser/locale/zh_TW/ trunk/filebrowser/locale/zh_TW/LC_MESSAGES/ trunk/filebrowser/locale/zh_TW/LC_MESSAGES/django.mo (contents, props changed) trunk/filebrowser/locale/zh_TW/LC_MESSAGES/django.po trunk/filebrowser/management/ trunk/filebrowser/management/__init__.py trunk/filebrowser/management/commands/ trunk/filebrowser/management/commands/__init__.py trunk/filebrowser/management/commands/fb_version_generate.py trunk/filebrowser/management/commands/fb_version_remove.py trunk/filebrowser/media/ trunk/filebrowser/media/filebrowser/ trunk/filebrowser/media/filebrowser/css/ trunk/filebrowser/media/filebrowser/css/filebrowser.css (contents, props changed) trunk/filebrowser/media/filebrowser/img/ trunk/filebrowser/media/filebrowser/img/filebrowser_icon_delete.gif (contents, props changed) trunk/filebrowser/media/filebrowser/img/filebrowser_icon_delete_hover.gif (contents, props changed) trunk/filebrowser/media/filebrowser/img/filebrowser_icon_rename.gif (contents, props changed) trunk/filebrowser/media/filebrowser/img/filebrowser_icon_rename_hover.gif (contents, props changed) trunk/filebrowser/media/filebrowser/img/filebrowser_icon_select.gif (contents, props changed) trunk/filebrowser/media/filebrowser/img/filebrowser_icon_select_disabled.gif (contents, props changed) trunk/filebrowser/media/filebrowser/img/filebrowser_icon_select_hover.gif (contents, props changed) trunk/filebrowser/media/filebrowser/img/filebrowser_icon_show.gif (contents, props changed) trunk/filebrowser/media/filebrowser/img/filebrowser_icon_show_hover.gif (contents, props changed) trunk/filebrowser/media/filebrowser/img/filebrowser_icon_showversions.gif (contents, props changed) trunk/filebrowser/media/filebrowser/img/filebrowser_icon_showversions_hover.gif (contents, props changed) trunk/filebrowser/media/filebrowser/img/filebrowser_type_.gif (contents, props changed) trunk/filebrowser/media/filebrowser/img/filebrowser_type_audio.gif (contents, props changed) trunk/filebrowser/media/filebrowser/img/filebrowser_type_code.gif (contents, props changed) trunk/filebrowser/media/filebrowser/img/filebrowser_type_document.gif (contents, props changed) trunk/filebrowser/media/filebrowser/img/filebrowser_type_folder.gif (contents, props changed) trunk/filebrowser/media/filebrowser/img/filebrowser_type_image.gif (contents, props changed) trunk/filebrowser/media/filebrowser/img/filebrowser_type_video.gif (contents, props changed) trunk/filebrowser/media/filebrowser/img/icon-fb-preview-hover.png (contents, props changed) trunk/filebrowser/media/filebrowser/img/icon-fb-preview.png (contents, props changed) trunk/filebrowser/media/filebrowser/img/icon-fb-view-image-hover.png (contents, props changed) trunk/filebrowser/media/filebrowser/img/icon-pulldown-actions-active.png (contents, props changed) trunk/filebrowser/media/filebrowser/img/icon-pulldown-actions-hover.png (contents, props changed) trunk/filebrowser/media/filebrowser/img/icon-pulldown-actions.png (contents, props changed) trunk/filebrowser/media/filebrowser/img/icon-showversions.png (contents, props changed) trunk/filebrowser/media/filebrowser/js/ trunk/filebrowser/media/filebrowser/js/AddFileBrowser.js trunk/filebrowser/media/filebrowser/js/FB_CKEditor.js trunk/filebrowser/media/filebrowser/js/FB_FileBrowseField.js (contents, props changed) trunk/filebrowser/media/filebrowser/js/FB_TinyMCE.js (contents, props changed) trunk/filebrowser/media/filebrowser/js/TinyMCEAdmin.js trunk/filebrowser/media/filebrowser/uploadify/ trunk/filebrowser/media/filebrowser/uploadify/Uploadify v2.1.0 Manual.pdf (contents, props changed) trunk/filebrowser/media/filebrowser/uploadify/cancel.png (contents, props changed) trunk/filebrowser/media/filebrowser/uploadify/check.php (contents, props changed) trunk/filebrowser/media/filebrowser/uploadify/com/ trunk/filebrowser/media/filebrowser/uploadify/com/adobe/ trunk/filebrowser/media/filebrowser/uploadify/com/adobe/air/ trunk/filebrowser/media/filebrowser/uploadify/com/adobe/air/logging/ trunk/filebrowser/media/filebrowser/uploadify/com/adobe/air/logging/FileTarget.as (contents, props changed) trunk/filebrowser/media/filebrowser/uploadify/com/adobe/crypto/ trunk/filebrowser/media/filebrowser/uploadify/com/adobe/crypto/HMAC.as (contents, props changed) trunk/filebrowser/media/filebrowser/uploadify/com/adobe/crypto/MD5.as (contents, props changed) trunk/filebrowser/media/filebrowser/uploadify/com/adobe/crypto/MD5Stream.as (contents, props changed) trunk/filebrowser/media/filebrowser/uploadify/com/adobe/crypto/SHA1.as (contents, props changed) trunk/filebrowser/media/filebrowser/uploadify/com/adobe/crypto/SHA224.as (contents, props changed) trunk/filebrowser/media/filebrowser/uploadify/com/adobe/crypto/SHA256.as (contents, props changed) trunk/filebrowser/media/filebrowser/uploadify/com/adobe/crypto/WSSEUsernameToken.as (contents, props changed) trunk/filebrowser/media/filebrowser/uploadify/com/adobe/errors/ trunk/filebrowser/media/filebrowser/uploadify/com/adobe/errors/IllegalStateError.as (contents, props changed) trunk/filebrowser/media/filebrowser/uploadify/com/adobe/fileformats/ trunk/filebrowser/media/filebrowser/uploadify/com/adobe/fileformats/vcard/ trunk/filebrowser/media/filebrowser/uploadify/com/adobe/fileformats/vcard/Address.as (contents, props changed) trunk/filebrowser/media/filebrowser/uploadify/com/adobe/fileformats/vcard/Email.as (contents, props changed) trunk/filebrowser/media/filebrowser/uploadify/com/adobe/fileformats/vcard/Phone.as (contents, props changed) trunk/filebrowser/media/filebrowser/uploadify/com/adobe/fileformats/vcard/VCard.as (contents, props changed) trunk/filebrowser/media/filebrowser/uploadify/com/adobe/fileformats/vcard/VCardParser.as (contents, props changed) trunk/filebrowser/media/filebrowser/uploadify/com/adobe/images/ trunk/filebrowser/media/filebrowser/uploadify/com/adobe/images/BitString.as (contents, props changed) trunk/filebrowser/media/filebrowser/uploadify/com/adobe/images/JPGEncoder.as (contents, props changed) trunk/filebrowser/media/filebrowser/uploadify/com/adobe/images/PNGEncoder.as (contents, props changed) trunk/filebrowser/media/filebrowser/uploadify/com/adobe/net/ trunk/filebrowser/media/filebrowser/uploadify/com/adobe/net/DynamicURLLoader.as (contents, props changed) trunk/filebrowser/media/filebrowser/uploadify/com/adobe/net/IURIResolver.as (contents, props changed) trunk/filebrowser/media/filebrowser/uploadify/com/adobe/net/MimeTypeMap.as (contents, props changed) trunk/filebrowser/media/filebrowser/uploadify/com/adobe/net/URI.as (contents, props changed) trunk/filebrowser/media/filebrowser/uploadify/com/adobe/net/URIEncodingBitmap.as (contents, props changed) trunk/filebrowser/media/filebrowser/uploadify/com/adobe/net/proxies/ trunk/filebrowser/media/filebrowser/uploadify/com/adobe/net/proxies/RFC2817Socket.as (contents, props changed) trunk/filebrowser/media/filebrowser/uploadify/com/adobe/protocols/ trunk/filebrowser/media/filebrowser/uploadify/com/adobe/protocols/dict/ trunk/filebrowser/media/filebrowser/uploadify/com/adobe/protocols/dict/Database.as (contents, props changed) trunk/filebrowser/media/filebrowser/uploadify/com/adobe/protocols/dict/Definition.as (contents, props changed) trunk/filebrowser/media/filebrowser/uploadify/com/adobe/protocols/dict/Dict.as (contents, props changed) trunk/filebrowser/media/filebrowser/uploadify/com/adobe/protocols/dict/DictionaryServer.as (contents, props changed) trunk/filebrowser/media/filebrowser/uploadify/com/adobe/protocols/dict/MatchStrategy.as (contents, props changed) trunk/filebrowser/media/filebrowser/uploadify/com/adobe/protocols/dict/Response.as (contents, props changed) trunk/filebrowser/media/filebrowser/uploadify/com/adobe/protocols/dict/events/ trunk/filebrowser/media/filebrowser/uploadify/com/adobe/protocols/dict/events/ConnectedEvent.as (contents, props changed) trunk/filebrowser/media/filebrowser/uploadify/com/adobe/protocols/dict/events/DatabaseEvent.as (contents, props changed) trunk/filebrowser/media/filebrowser/uploadify/com/adobe/protocols/dict/events/DefinitionEvent.as (contents, props changed) trunk/filebrowser/media/filebrowser/uploadify/com/adobe/protocols/dict/events/DefinitionHeaderEvent.as (contents, props changed) trunk/filebrowser/media/filebrowser/uploadify/com/adobe/protocols/dict/events/DictionaryServerEvent.as (contents, props changed) trunk/filebrowser/media/filebrowser/uploadify/com/adobe/protocols/dict/events/DisconnectedEvent.as (contents, props changed) trunk/filebrowser/media/filebrowser/uploadify/com/adobe/protocols/dict/events/ErrorEvent.as (contents, props changed) trunk/filebrowser/media/filebrowser/uploadify/com/adobe/protocols/dict/events/MatchEvent.as (contents, props changed) trunk/filebrowser/media/filebrowser/uploadify/com/adobe/protocols/dict/events/MatchStrategiesEvent.as (contents, props changed) trunk/filebrowser/media/filebrowser/uploadify/com/adobe/protocols/dict/events/NoMatchEvent.as (contents, props changed) trunk/filebrowser/media/filebrowser/uploadify/com/adobe/protocols/dict/util/ trunk/filebrowser/media/filebrowser/uploadify/com/adobe/protocols/dict/util/CompleteResponseEvent.as (contents, props changed) trunk/filebrowser/media/filebrowser/uploadify/com/adobe/protocols/dict/util/SocketHelper.as (contents, props changed) trunk/filebrowser/media/filebrowser/uploadify/com/adobe/serialization/ trunk/filebrowser/media/filebrowser/uploadify/com/adobe/serialization/json/ trunk/filebrowser/media/filebrowser/uploadify/com/adobe/serialization/json/JSON.as (contents, props changed) trunk/filebrowser/media/filebrowser/uploadify/com/adobe/serialization/json/JSONDecoder.as (contents, props changed) trunk/filebrowser/media/filebrowser/uploadify/com/adobe/serialization/json/JSONEncoder.as (contents, props changed) trunk/filebrowser/media/filebrowser/uploadify/com/adobe/serialization/json/JSONParseError.as (contents, props changed) trunk/filebrowser/media/filebrowser/uploadify/com/adobe/serialization/json/JSONToken.as (contents, props changed) trunk/filebrowser/media/filebrowser/uploadify/com/adobe/serialization/json/JSONTokenType.as (contents, props changed) trunk/filebrowser/media/filebrowser/uploadify/com/adobe/serialization/json/JSONTokenizer.as (contents, props changed) trunk/filebrowser/media/filebrowser/uploadify/com/adobe/utils/ trunk/filebrowser/media/filebrowser/uploadify/com/adobe/utils/ArrayUtil.as (contents, props changed) trunk/filebrowser/media/filebrowser/uploadify/com/adobe/utils/DateUtil.as (contents, props changed) trunk/filebrowser/media/filebrowser/uploadify/com/adobe/utils/DictionaryUtil.as (contents, props changed) trunk/filebrowser/media/filebrowser/uploadify/com/adobe/utils/IntUtil.as (contents, props changed) trunk/filebrowser/media/filebrowser/uploadify/com/adobe/utils/NumberFormatter.as (contents, props changed) trunk/filebrowser/media/filebrowser/uploadify/com/adobe/utils/StringUtil.as (contents, props changed) trunk/filebrowser/media/filebrowser/uploadify/com/adobe/utils/XMLUtil.as (contents, props changed) trunk/filebrowser/media/filebrowser/uploadify/com/adobe/webapis/ trunk/filebrowser/media/filebrowser/uploadify/com/adobe/webapis/ServiceBase.as (contents, props changed) trunk/filebrowser/media/filebrowser/uploadify/com/adobe/webapis/URLLoaderBase.as (contents, props changed) trunk/filebrowser/media/filebrowser/uploadify/com/adobe/webapis/events/ trunk/filebrowser/media/filebrowser/uploadify/com/adobe/webapis/events/ServiceEvent.as (contents, props changed) trunk/filebrowser/media/filebrowser/uploadify/example/ trunk/filebrowser/media/filebrowser/uploadify/example/_notes/ trunk/filebrowser/media/filebrowser/uploadify/example/_notes/dwsync.xml (contents, props changed) trunk/filebrowser/media/filebrowser/uploadify/example/cancel.png (contents, props changed) trunk/filebrowser/media/filebrowser/uploadify/example/css/ trunk/filebrowser/media/filebrowser/uploadify/example/css/_notes/ trunk/filebrowser/media/filebrowser/uploadify/example/css/_notes/dwsync.xml (contents, props changed) trunk/filebrowser/media/filebrowser/uploadify/example/css/default.css (contents, props changed) trunk/filebrowser/media/filebrowser/uploadify/example/css/uploadify.css (contents, props changed) trunk/filebrowser/media/filebrowser/uploadify/example/index.php (contents, props changed) trunk/filebrowser/media/filebrowser/uploadify/example/scripts/ trunk/filebrowser/media/filebrowser/uploadify/example/scripts/_notes/ trunk/filebrowser/media/filebrowser/uploadify/example/scripts/_notes/dwsync.xml (contents, props changed) trunk/filebrowser/media/filebrowser/uploadify/example/scripts/check.php (contents, props changed) trunk/filebrowser/media/filebrowser/uploadify/example/scripts/expressInstall.swf (contents, props changed) trunk/filebrowser/media/filebrowser/uploadify/example/scripts/jquery-1.3.2.min.js (contents, props changed) trunk/filebrowser/media/filebrowser/uploadify/example/scripts/jquery.uploadify.v2.1.0.min.js (contents, props changed) trunk/filebrowser/media/filebrowser/uploadify/example/scripts/swfobject.js (contents, props changed) trunk/filebrowser/media/filebrowser/uploadify/example/scripts/uploadify.php (contents, props changed) trunk/filebrowser/media/filebrowser/uploadify/example/scripts/uploadify.swf (contents, props changed) trunk/filebrowser/media/filebrowser/uploadify/example/uploads/ trunk/filebrowser/media/filebrowser/uploadify/expressInstall.swf (contents, props changed) trunk/filebrowser/media/filebrowser/uploadify/jquery-1.3.2.min.js (contents, props changed) trunk/filebrowser/media/filebrowser/uploadify/jquery.uploadify.v2.1.0.js (contents, props changed) trunk/filebrowser/media/filebrowser/uploadify/jquery.uploadify.v2.1.0.min.js (contents, props changed) trunk/filebrowser/media/filebrowser/uploadify/swfobject.js (contents, props changed) trunk/filebrowser/media/filebrowser/uploadify/uploadify.allglyphs.swf (contents, props changed) trunk/filebrowser/media/filebrowser/uploadify/uploadify.css (contents, props changed) trunk/filebrowser/media/filebrowser/uploadify/uploadify.fla (contents, props changed) trunk/filebrowser/media/filebrowser/uploadify/uploadify.php (contents, props changed) trunk/filebrowser/media/filebrowser/uploadify/uploadify.swf (contents, props changed) trunk/filebrowser/models.py (contents, props changed) trunk/filebrowser/settings.py (contents, props changed) trunk/filebrowser/templates/ trunk/filebrowser/templates/filebrowser/ trunk/filebrowser/templates/filebrowser/append.html trunk/filebrowser/templates/filebrowser/custom_field.html trunk/filebrowser/templates/filebrowser/include/ trunk/filebrowser/templates/filebrowser/include/_response.html trunk/filebrowser/templates/filebrowser/include/breadcrumbs.html trunk/filebrowser/templates/filebrowser/include/filelisting.html trunk/filebrowser/templates/filebrowser/include/filter.html trunk/filebrowser/templates/filebrowser/include/paginator.html trunk/filebrowser/templates/filebrowser/include/search.html trunk/filebrowser/templates/filebrowser/include/tableheader.html trunk/filebrowser/templates/filebrowser/include/toolbar.html trunk/filebrowser/templates/filebrowser/index.html trunk/filebrowser/templates/filebrowser/makedir.html trunk/filebrowser/templates/filebrowser/rename.html trunk/filebrowser/templates/filebrowser/upload.html trunk/filebrowser/templates/filebrowser/versions.html trunk/filebrowser/templatetags/ trunk/filebrowser/templatetags/__init__.py trunk/filebrowser/templatetags/fb_csrf.py trunk/filebrowser/templatetags/fb_pagination.py trunk/filebrowser/templatetags/fb_tags.py trunk/filebrowser/templatetags/fb_versions.py trunk/filebrowser/urls.py trunk/filebrowser/views.py Log: filebrowser added. --- LICENSE | 24 base.py | 219 decorators.py | 30 fields.py | 127 forms.py | 63 functions.py | 388 + locale/ca/LC_MESSAGES/django.po | 328 + locale/de/LC_MESSAGES/django.po | 408 + locale/es/LC_MESSAGES/django.po | 328 + locale/fr/LC_MESSAGES/django.po | 336 + locale/it/LC_MESSAGES/django.po | 356 + locale/nl/LC_MESSAGES/django.po | 319 + locale/ru/LC_MESSAGES/django.po | 394 + locale/sr/LC_MESSAGES/django.po | 376 + locale/sr_Latn/LC_MESSAGES/django.po | 376 + locale/zh_CN/LC_MESSAGES/django.po | 370 + locale/zh_TW/LC_MESSAGES/django.po | 370 + management/commands/fb_version_generate.py | 84 management/commands/fb_version_remove.py | 132 media/filebrowser/css/filebrowser.css | 195 media/filebrowser/js/AddFileBrowser.js | 42 media/filebrowser/js/FB_CKEditor.js | 24 media/filebrowser/js/FB_FileBrowseField.js | 32 media/filebrowser/js/FB_TinyMCE.js | 28 media/filebrowser/js/TinyMCEAdmin.js | 75 media/filebrowser/uploadify/check.php | 35 media/filebrowser/uploadify/com/adobe/air/logging/FileTarget.as | 98 media/filebrowser/uploadify/com/adobe/crypto/HMAC.as | 127 media/filebrowser/uploadify/com/adobe/crypto/MD5.as | 281 + media/filebrowser/uploadify/com/adobe/crypto/MD5Stream.as | 402 + media/filebrowser/uploadify/com/adobe/crypto/SHA1.as | 271 + media/filebrowser/uploadify/com/adobe/crypto/SHA224.as | 257 + media/filebrowser/uploadify/com/adobe/crypto/SHA256.as | 261 + media/filebrowser/uploadify/com/adobe/crypto/WSSEUsernameToken.as | 114 media/filebrowser/uploadify/com/adobe/errors/IllegalStateError.as | 63 media/filebrowser/uploadify/com/adobe/fileformats/vcard/Address.as | 47 media/filebrowser/uploadify/com/adobe/fileformats/vcard/Email.as | 39 media/filebrowser/uploadify/com/adobe/fileformats/vcard/Phone.as | 39 media/filebrowser/uploadify/com/adobe/fileformats/vcard/VCard.as | 54 media/filebrowser/uploadify/com/adobe/fileformats/vcard/VCardParser.as | 246 media/filebrowser/uploadify/com/adobe/images/BitString.as | 39 media/filebrowser/uploadify/com/adobe/images/JPGEncoder.as | 648 ++ media/filebrowser/uploadify/com/adobe/images/PNGEncoder.as | 141 media/filebrowser/uploadify/com/adobe/net/DynamicURLLoader.as | 55 media/filebrowser/uploadify/com/adobe/net/IURIResolver.as | 76 media/filebrowser/uploadify/com/adobe/net/MimeTypeMap.as | 196 media/filebrowser/uploadify/com/adobe/net/URI.as | 2466 ++++++++++ media/filebrowser/uploadify/com/adobe/net/URIEncodingBitmap.as | 139 media/filebrowser/uploadify/com/adobe/net/proxies/RFC2817Socket.as | 198 media/filebrowser/uploadify/com/adobe/protocols/dict/Database.as | 34 media/filebrowser/uploadify/com/adobe/protocols/dict/Definition.as | 39 media/filebrowser/uploadify/com/adobe/protocols/dict/Dict.as | 328 + media/filebrowser/uploadify/com/adobe/protocols/dict/DictionaryServer.as | 28 media/filebrowser/uploadify/com/adobe/protocols/dict/MatchStrategy.as | 34 media/filebrowser/uploadify/com/adobe/protocols/dict/Response.as | 39 media/filebrowser/uploadify/com/adobe/protocols/dict/events/ConnectedEvent.as | 14 media/filebrowser/uploadify/com/adobe/protocols/dict/events/DatabaseEvent.as | 26 media/filebrowser/uploadify/com/adobe/protocols/dict/events/DefinitionEvent.as | 27 media/filebrowser/uploadify/com/adobe/protocols/dict/events/DefinitionHeaderEvent.as | 26 media/filebrowser/uploadify/com/adobe/protocols/dict/events/DictionaryServerEvent.as | 26 media/filebrowser/uploadify/com/adobe/protocols/dict/events/DisconnectedEvent.as | 14 media/filebrowser/uploadify/com/adobe/protocols/dict/events/ErrorEvent.as | 37 media/filebrowser/uploadify/com/adobe/protocols/dict/events/MatchEvent.as | 26 media/filebrowser/uploadify/com/adobe/protocols/dict/events/MatchStrategiesEvent.as | 26 media/filebrowser/uploadify/com/adobe/protocols/dict/events/NoMatchEvent.as | 14 media/filebrowser/uploadify/com/adobe/protocols/dict/util/CompleteResponseEvent.as | 25 media/filebrowser/uploadify/com/adobe/protocols/dict/util/SocketHelper.as | 49 media/filebrowser/uploadify/com/adobe/serialization/json/JSON.as | 85 media/filebrowser/uploadify/com/adobe/serialization/json/JSONDecoder.as | 221 media/filebrowser/uploadify/com/adobe/serialization/json/JSONEncoder.as | 299 + media/filebrowser/uploadify/com/adobe/serialization/json/JSONParseError.as | 87 media/filebrowser/uploadify/com/adobe/serialization/json/JSONToken.as | 104 media/filebrowser/uploadify/com/adobe/serialization/json/JSONTokenType.as | 67 media/filebrowser/uploadify/com/adobe/serialization/json/JSONTokenizer.as | 583 ++ media/filebrowser/uploadify/com/adobe/utils/ArrayUtil.as | 187 media/filebrowser/uploadify/com/adobe/utils/DateUtil.as | 699 ++ media/filebrowser/uploadify/com/adobe/utils/DictionaryUtil.as | 87 media/filebrowser/uploadify/com/adobe/utils/IntUtil.as | 99 media/filebrowser/uploadify/com/adobe/utils/NumberFormatter.as | 74 media/filebrowser/uploadify/com/adobe/utils/StringUtil.as | 270 + media/filebrowser/uploadify/com/adobe/utils/XMLUtil.as | 168 media/filebrowser/uploadify/com/adobe/webapis/ServiceBase.as | 48 media/filebrowser/uploadify/com/adobe/webapis/URLLoaderBase.as | 108 media/filebrowser/uploadify/com/adobe/webapis/events/ServiceEvent.as | 75 media/filebrowser/uploadify/example/_notes/dwsync.xml | 5 media/filebrowser/uploadify/example/css/_notes/dwsync.xml | 5 media/filebrowser/uploadify/example/css/default.css | 10 media/filebrowser/uploadify/example/css/uploadify.css | 53 media/filebrowser/uploadify/example/index.php | 31 media/filebrowser/uploadify/example/scripts/_notes/dwsync.xml | 10 media/filebrowser/uploadify/example/scripts/check.php | 35 media/filebrowser/uploadify/example/scripts/jquery-1.3.2.min.js | 19 media/filebrowser/uploadify/example/scripts/jquery.uploadify.v2.1.0.min.js | 26 media/filebrowser/uploadify/example/scripts/swfobject.js | 4 media/filebrowser/uploadify/example/scripts/uploadify.php | 46 media/filebrowser/uploadify/jquery-1.3.2.min.js | 19 media/filebrowser/uploadify/jquery.uploadify.v2.1.0.js | 258 + media/filebrowser/uploadify/jquery.uploadify.v2.1.0.min.js | 26 media/filebrowser/uploadify/swfobject.js | 4 media/filebrowser/uploadify/uploadify.css | 53 media/filebrowser/uploadify/uploadify.php | 46 models.py | 1 settings.py | 128 templates/filebrowser/append.html | 12 templates/filebrowser/custom_field.html | 26 templates/filebrowser/include/_response.html | 1 templates/filebrowser/include/breadcrumbs.html | 24 templates/filebrowser/include/filelisting.html | 136 templates/filebrowser/include/filter.html | 27 templates/filebrowser/include/paginator.html | 28 templates/filebrowser/include/search.html | 31 templates/filebrowser/include/tableheader.html | 32 templates/filebrowser/include/toolbar.html | 36 templates/filebrowser/index.html | 143 templates/filebrowser/makedir.html | 45 templates/filebrowser/rename.html | 43 templates/filebrowser/upload.html | 113 templates/filebrowser/versions.html | 156 templatetags/fb_csrf.py | 30 templatetags/fb_pagination.py | 51 templatetags/fb_tags.py | 140 templatetags/fb_versions.py | 177 urls.py | 16 views.py | 494 ++ 124 files changed, 18329 insertions(+) From oi-svn at pardus.org.tr Wed Dec 15 16:48:56 2010 From: oi-svn at pardus.org.tr (=?utf-8?b?R8O2a21lbiBHw7ZyZ2Vu?=) Date: Wed, 15 Dec 2010 16:48:56 +0200 (EET) Subject: [Oi-commits] trunk - enable filebrowser Message-ID: <20101215144856.2815649CC76@ns1.pardus.org.tr> Author: gkmngrgn Date: Wed Dec 15 16:48:56 2010 New Revision: 3619 Modified: trunk/settings.py trunk/urls.py Log: enable filebrowser --- settings.py | 2 ++ urls.py | 1 + 2 files changed, 3 insertions(+) Modified: trunk/settings.py ================================================================= --- trunk/settings.py (original) +++ trunk/settings.py Wed Dec 15 16:48:56 2010 @@ -113,6 +113,7 @@ INSTALLED_APPS = ( 'grappelli', + 'filebrowser', 'django.contrib.auth', 'django.contrib.contenttypes', 'django.contrib.sessions', @@ -233,3 +234,4 @@ ) GRAPPELLI_ADMIN_TITLE = "?zg?rl?k??in" +FILEBROWSER_DIRECTORY = "upload/" Modified: trunk/urls.py ================================================================= --- trunk/urls.py (original) +++ trunk/urls.py Wed Dec 15 16:48:56 2010 @@ -209,6 +209,7 @@ (r'^admin/upload_progress/$', 'oi.upload.views.upload_progress'), (r'^admin/upload/image/tinymce/$', 'oi.upload.views.image_upload'), (r'^admin/', include(admin.site.urls)), + (r'^admin/filebrowser/', include('filebrowser.urls')), (r'^media/(.*)$', 'django.views.static.serve', {'document_root': '%s/media' % DOCUMENT_ROOT, 'show_indexes': True}), #Feeds From oi-svn at pardus.org.tr Wed Dec 15 16:49:25 2010 From: oi-svn at pardus.org.tr (=?utf-8?b?R8O2a21lbiBHw7ZyZ2Vu?=) Date: Wed, 15 Dec 2010 16:49:25 +0200 (EET) Subject: [Oi-commits] trunk/media - add symlink for filebrowser Message-ID: <20101215144925.F018549CC76@ns1.pardus.org.tr> Author: gkmngrgn Date: Wed Dec 15 16:49:25 2010 New Revision: 3620 Added: trunk/media/filebrowser (contents, props changed) Log: add symlink for filebrowser --- filebrowser | 1 + 1 file changed, 1 insertion(+) From oi-svn at pardus.org.tr Wed Dec 15 18:46:20 2010 From: oi-svn at pardus.org.tr (=?utf-8?q?=C4=B0lker_Kesen?=) Date: Wed, 15 Dec 2010 18:46:20 +0200 (EET) Subject: [Oi-commits] trunk - ordering in paginator problem fixed Message-ID: <20101215164621.07C6949C950@ns1.pardus.org.tr> Author: ilker Date: Wed Dec 15 18:46:20 2010 New Revision: 3621 Added: trunk/templates/paginator_for_tema.html Modified: trunk/st/templatetags/library.py trunk/templates/tema/themeitem_list.html Log: ordering in paginator problem fixed --- st/templatetags/library.py | 29 +++++++++++++++++++++++++++++ templates/paginator_for_tema.html | 18 ++++++++++++++++++ templates/tema/themeitem_list.html | 2 +- 3 files changed, 48 insertions(+), 1 deletion(-) Modified: trunk/st/templatetags/library.py ================================================================= --- trunk/st/templatetags/library.py (original) +++ trunk/st/templatetags/library.py Wed Dec 15 18:46:20 2010 @@ -64,6 +64,35 @@ 'show_first': 1 not in page_numbers, 'show_last': context['pages'] not in page_numbers, } + + at register.inclusion_tag('paginator_for_tema.html', takes_context=True) +def paginator_for_tema(context, adjacent_pages=4): + """ + To be used in conjunction with the object_list generic view. + + Adds pagination context variables for use in displaying first, adjacent and + last page links in addition to those created by the object_list generic + view. + + """ + page_numbers = [n for n in \ + range(context['page'] - adjacent_pages, context['page'] + adjacent_pages + 1) \ + if n > 0 and n <= context['pages']] + return { + 'hits': context['hits'], + 'results_per_page': context['results_per_page'], + 'page': context['page'], + 'pages': context['pages'], + 'page_numbers': page_numbers, + 'next': context['next'], + 'previous': context['previous'], + 'has_next': context['has_next'], + 'has_previous': context['has_previous'], + 'show_first': 1 not in page_numbers, + 'show_last': context['pages'] not in page_numbers, + 'order': context['order'] + } + @register.filter def timedelta(value, arg=None): Modified: trunk/templates/tema/themeitem_list.html ================================================================= --- trunk/templates/tema/themeitem_list.html (original) +++ trunk/templates/tema/themeitem_list.html Wed Dec 15 18:46:20 2010 @@ -36,5 +36,5 @@ {% endfor %}
    -{% if is_paginated %}
    {% paginator %}
    {{ pages }} sayfada toplam {{ hits }} i?erik bulunmaktad?r.
    {% endif %} +{% if is_paginated %}
    {% paginator_for_tema %}
    {{ pages }} sayfada toplam {{ hits }} i?erik bulunmaktad?r.
    {% endif %} {% endblock %} From oi-svn at pardus.org.tr Wed Dec 15 21:22:33 2010 From: oi-svn at pardus.org.tr (=?utf-8?b?R8O2a21lbiBHw7ZyZ2Vu?=) Date: Wed, 15 Dec 2010 21:22:33 +0200 (EET) Subject: [Oi-commits] branches/oi-with-grappelli - new branch for grappelli. Message-ID: <20101215192233.AB68149C950@ns1.pardus.org.tr> Author: gkmngrgn Date: Wed Dec 15 21:22:33 2010 New Revision: 3622 Added: branches/oi-with-grappelli/ - copied from r3621, trunk/ Log: new branch for grappelli. From oi-svn at pardus.org.tr Wed Dec 15 21:28:46 2010 From: oi-svn at pardus.org.tr (=?utf-8?b?R8O2a21lbiBHw7ZyZ2Vu?=) Date: Wed, 15 Dec 2010 21:28:46 +0200 (EET) Subject: [Oi-commits] trunk - remove grappelli, filebrowser Message-ID: <20101215192846.961A949C950@ns1.pardus.org.tr> Author: gkmngrgn Date: Wed Dec 15 21:28:46 2010 New Revision: 3623 Removed: trunk/filebrowser/ trunk/grappelli/ Modified: trunk/settings.py Log: remove grappelli, filebrowser --- settings.py | 5 ----- 1 file changed, 5 deletions(-) Modified: trunk/settings.py ================================================================= --- trunk/settings.py (original) +++ trunk/settings.py Wed Dec 15 21:28:46 2010 @@ -112,8 +112,6 @@ ) INSTALLED_APPS = ( - 'grappelli', - 'filebrowser', 'django.contrib.auth', 'django.contrib.contenttypes', 'django.contrib.sessions', @@ -232,6 +230,3 @@ ('zonguldak','Zonguldak'), ('zzyurtdisi', 'Yurtd???'), ) - -GRAPPELLI_ADMIN_TITLE = "?zg?rl?k??in" -FILEBROWSER_DIRECTORY = "upload/" From oi-svn at pardus.org.tr Wed Dec 15 21:30:05 2010 From: oi-svn at pardus.org.tr (=?utf-8?b?R8O2a21lbiBHw7ZyZ2Vu?=) Date: Wed, 15 Dec 2010 21:30:05 +0200 (EET) Subject: [Oi-commits] trunk - remove grappelli context processor. Message-ID: <20101215193005.C6F2F49C950@ns1.pardus.org.tr> Author: gkmngrgn Date: Wed Dec 15 21:30:05 2010 New Revision: 3624 Modified: trunk/settings.py Log: remove grappelli context processor. --- settings.py | 1 - 1 file changed, 1 deletion(-) Modified: trunk/settings.py ================================================================= --- trunk/settings.py (original) +++ trunk/settings.py Wed Dec 15 21:30:05 2010 @@ -89,7 +89,6 @@ 'oi.context_processors.testing', 'django.core.context_processors.auth', 'django.core.context_processors.request', - 'grappelli.context_processors.admin_template_path', ) MIDDLEWARE_CLASSES = ( From oi-svn at pardus.org.tr Wed Dec 15 21:36:00 2010 From: oi-svn at pardus.org.tr (=?utf-8?q?=C4=B0lker_Kesen?=) Date: Wed, 15 Dec 2010 21:36:00 +0200 (EET) Subject: [Oi-commits] trunk - remove grappelli media files, it has moved to bran... Message-ID: <20101215193600.D8CDD49C950@ns1.pardus.org.tr> Author: ilker Date: Wed Dec 15 21:36:00 2010 New Revision: 3625 Modified: trunk/ezine/admin.py trunk/podcast/admin.py trunk/st/admin.py trunk/tema/admin.py Log: remove grappelli media files, it has moved to branch --- ezine/admin.py | 4 +--- podcast/admin.py | 2 +- st/admin.py | 2 +- tema/admin.py | 2 +- 4 files changed, 4 insertions(+), 6 deletions(-) Modified: trunk/ezine/admin.py ================================================================= --- trunk/ezine/admin.py (original) +++ trunk/ezine/admin.py Wed Dec 15 21:36:00 2010 @@ -14,8 +14,6 @@ list_display = ('title',) class Media: - js = ( - 'admin/tinymce/jscripts/tiny_mce/tiny_mce.js', - 'js/jquery-1.4.2.min.js', 'js/adminimages.js', 'js/tinymce_setup.js') + js = ("js/tinymce/tiny_mce.js", "js/tinymce/textareas.js", "js/jquery-1.2.6.min.js", "js/adminimages.js") admin.site.register(Ezine, EzineAdmin) Modified: trunk/podcast/admin.py ================================================================= --- trunk/podcast/admin.py (original) +++ trunk/podcast/admin.py Wed Dec 15 21:36:00 2010 @@ -12,7 +12,7 @@ class EpisodeAdmin(admin.ModelAdmin): exclude = ("topic", "minutes", "seconds") class Media: - js = ("admin/tinymce/jscripts/tiny_mce/tiny_mce.js", "js/tinymce_setup.js", "js/jquery-1.4.2.min.js", "js/adminimages.js", "js/jquery.autocomplete.js", "js/taghelper.js") + js = ("js/tinymce/tiny_mce.js", "js/tinymce/textareas.js", "js/jquery-1.2.6.min.js", "js/adminimages.js", "js/jquery.autocomplete.js", "js/taghelper.js") css = { "all": ("css/new/grappelli.autocomplete.css",), } Modified: trunk/st/admin.py ================================================================= --- trunk/st/admin.py (original) +++ trunk/st/admin.py Wed Dec 15 21:36:00 2010 @@ -28,7 +28,7 @@ prepopulated_fields = {'slug': ("title",)} class Media: - js = ("admin/tinymce/jscripts/tiny_mce/tiny_mce.js", "js/tinymce_setup.js", "js/jquery-1.4.2.min.js", "js/adminimages.js", "js/jquery.autocomplete.js", "js/taghelper.js") + js = ("js/tinymce/tiny_mce.js", "js/tinymce/textareas.js", "js/jquery-1.2.6.min.js", "js/adminimages.js", "js/jquery.autocomplete.js", "js/taghelper.js") css = { "all": ("css/new/grappelli.autocomplete.css",), } Modified: trunk/tema/admin.py ================================================================= --- trunk/tema/admin.py (original) +++ trunk/tema/admin.py Wed Dec 15 21:36:00 2010 @@ -25,7 +25,7 @@ search_fields = ["title", "text", "changelog"] class Media: - js = ("js/jquery-1.4.2.min.js", "js/temaimages.js", "js/jquery.autocomplete.js", "js/taghelper.js") + js = ("js/jquery-1.2.6.min.js", "js/temaimages.js", "js/jquery.autocomplete.js", "js/taghelper.js") css = { "all": ("css/new/grappelli.autocomplete.css",), } From oi-svn at pardus.org.tr Wed Dec 15 21:41:51 2010 From: oi-svn at pardus.org.tr (=?utf-8?q?=C4=B0lker_Kesen?=) Date: Wed, 15 Dec 2010 21:41:51 +0200 (EET) Subject: [Oi-commits] trunk - switch to old autocomplete.css Message-ID: <20101215194151.A2CF149C950@ns1.pardus.org.tr> Author: ilker Date: Wed Dec 15 21:41:51 2010 New Revision: 3626 Modified: trunk/podcast/admin.py trunk/st/admin.py trunk/tema/admin.py Log: switch to old autocomplete.css --- podcast/admin.py | 2 +- st/admin.py | 2 +- tema/admin.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) Modified: trunk/podcast/admin.py ================================================================= --- trunk/podcast/admin.py (original) +++ trunk/podcast/admin.py Wed Dec 15 21:41:51 2010 @@ -14,7 +14,7 @@ class Media: js = ("js/tinymce/tiny_mce.js", "js/tinymce/textareas.js", "js/jquery-1.2.6.min.js", "js/adminimages.js", "js/jquery.autocomplete.js", "js/taghelper.js") css = { - "all": ("css/new/grappelli.autocomplete.css",), + "all": ("css/new/autocomplete.css",), } admin.site.register(Author) Modified: trunk/st/admin.py ================================================================= --- trunk/st/admin.py (original) +++ trunk/st/admin.py Wed Dec 15 21:41:51 2010 @@ -30,7 +30,7 @@ class Media: js = ("js/tinymce/tiny_mce.js", "js/tinymce/textareas.js", "js/jquery-1.2.6.min.js", "js/adminimages.js", "js/jquery.autocomplete.js", "js/taghelper.js") css = { - "all": ("css/new/grappelli.autocomplete.css",), + "all": ("css/new/autocomplete.css",), } class FSAdmin(ArticleAdmin): Modified: trunk/tema/admin.py ================================================================= --- trunk/tema/admin.py (original) +++ trunk/tema/admin.py Wed Dec 15 21:41:51 2010 @@ -27,7 +27,7 @@ class Media: js = ("js/jquery-1.2.6.min.js", "js/temaimages.js", "js/jquery.autocomplete.js", "js/taghelper.js") css = { - "all": ("css/new/grappelli.autocomplete.css",), + "all": ("css/new/autocomplete.css",), } class WallpaperAdmin(ThemeItemAdmin): From oi-svn at pardus.org.tr Wed Dec 15 21:47:35 2010 From: oi-svn at pardus.org.tr (=?utf-8?q?=C4=B0lker_Kesen?=) Date: Wed, 15 Dec 2010 21:47:35 +0200 (EET) Subject: [Oi-commits] trunk/tema - enable openoffice admin classes Message-ID: <20101215194735.A5DC449C950@ns1.pardus.org.tr> Author: ilker Date: Wed Dec 15 21:47:35 2010 New Revision: 3627 Modified: trunk/tema/admin.py Log: enable openoffice admin classes --- admin.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) Modified: trunk/tema/admin.py ================================================================= --- trunk/tema/admin.py (original) +++ trunk/tema/admin.py Wed Dec 15 21:47:35 2010 @@ -73,8 +73,8 @@ class IconSetAdmin(ThemeItemAdmin): list_display = ("title", "author", "license", "status") - #class OpenOfficeThemeAdmin(ThemeItemAdmin): -# list_display = ("title", "version", "author", "license", "status") +class OpenOfficeThemeAdmin(ThemeItemAdmin): + list_display = ("title", "author", "license", "status") class PackageScreenshotAdmin(ThemeItemAdmin): list_display = ("title", "version", "author", "license", "status") @@ -89,7 +89,7 @@ admin.site.register(WallpaperFile, admin.ModelAdmin) admin.site.register(License, admin.ModelAdmin) admin.site.register(WallpaperCategory, CategoryAdmin) -admin.site.register(OpenOfficeThemeCategory) -admin.site.register(OpenOfficeTheme) +admin.site.register(OpenOfficeThemeCategory, CategoryAdmin) +admin.site.register(OpenOfficeTheme, OpenOfficeThemeAdmin) admin.site.register(IconSet,IconSetAdmin) admin.site.register(PackageScreenshot, PackageScreenshotAdmin) From oi-svn at pardus.org.tr Wed Dec 15 21:55:34 2010 From: oi-svn at pardus.org.tr (=?utf-8?b?R8O2a21lbiBHw7ZyZ2Vu?=) Date: Wed, 15 Dec 2010 21:55:34 +0200 (EET) Subject: [Oi-commits] trunk/media - remove symlinks Message-ID: <20101215195534.95FAC49C950@ns1.pardus.org.tr> Author: gkmngrgn Date: Wed Dec 15 21:55:34 2010 New Revision: 3628 Removed: trunk/media/admin trunk/media/filebrowser Log: remove symlinks --- admin | 1 - filebrowser | 1 - 2 files changed, 2 deletions(-) From oi-svn at pardus.org.tr Wed Dec 15 21:58:18 2010 From: oi-svn at pardus.org.tr (=?utf-8?q?=C4=B0lker_Kesen?=) Date: Wed, 15 Dec 2010 21:58:18 +0200 (EET) Subject: [Oi-commits] trunk/tema - user interface upgraded Message-ID: <20101215195818.E425549C950@ns1.pardus.org.tr> Author: ilker Date: Wed Dec 15 21:58:18 2010 New Revision: 3629 Modified: trunk/tema/admin.py Log: user interface upgraded --- admin.py | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) Modified: trunk/tema/admin.py ================================================================= --- trunk/tema/admin.py (original) +++ trunk/tema/admin.py Wed Dec 15 21:58:18 2010 @@ -75,9 +75,31 @@ class OpenOfficeThemeAdmin(ThemeItemAdmin): list_display = ("title", "author", "license", "status") + fieldsets = ( + (None, { + "fields": ("thumbnail", "title", "slug", "version", + "text", "changelog", "screenshot", "file", "status", + "deny_reason", "tags") + }), + ("Di?er", { + "classes": "collapse", + "fields": ("author", "license", "rating", "download_count", "submit", "update", "comment_enabled") + }) + ) class PackageScreenshotAdmin(ThemeItemAdmin): list_display = ("title", "version", "author", "license", "status") + fieldsets = ( + (None, { + "fields": ("thumbnail", "title", "slug", "version", + "text", "changelog", "image", "s_image", "status", + "deny_reason", "tags") + }), + ("Di?er", { + "classes": "collapse", + "fields": ("author", "license", "rating", "download_count", "submit", "update", "comment_enabled") + }) + ) class CategoryAdmin(admin.ModelAdmin): prepopulated_fields = {"slug": ("name",)} From oi-svn at pardus.org.tr Wed Dec 15 22:04:28 2010 From: oi-svn at pardus.org.tr (=?utf-8?q?=C4=B0lker_Kesen?=) Date: Wed, 15 Dec 2010 22:04:28 +0200 (EET) Subject: [Oi-commits] trunk/tema - little fixes and icon set admin ui upgraded Message-ID: <20101215200428.955A149C950@ns1.pardus.org.tr> Author: ilker Date: Wed Dec 15 22:04:28 2010 New Revision: 3630 Modified: trunk/tema/admin.py Log: little fixes and icon set admin ui upgraded --- admin.py | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) Modified: trunk/tema/admin.py ================================================================= --- trunk/tema/admin.py (original) +++ trunk/tema/admin.py Wed Dec 15 22:04:28 2010 @@ -72,14 +72,25 @@ class IconSetAdmin(ThemeItemAdmin): list_display = ("title", "author", "license", "status") + fieldsets = ( + (None, { + "fields": ("thumbnail", "title", "slug", "version", + "origin_url", "text", "changelog", "screenshot", "file", + "status", "deny_reason", "tags") + }), + ("Di?er", { + "classes": "collapse", + "fields": ("author", "license", "rating", "download_count", "submit", "update", "comment_enabled") + }), + ) class OpenOfficeThemeAdmin(ThemeItemAdmin): list_display = ("title", "author", "license", "status") fieldsets = ( (None, { "fields": ("thumbnail", "title", "slug", "version", - "text", "changelog", "screenshot", "file", "status", - "deny_reason", "tags") + "origin_url", "text", "changelog", "screenshot", "file", + "status", "deny_reason", "tags") }), ("Di?er", { "classes": "collapse", From oi-svn at pardus.org.tr Wed Dec 15 22:09:24 2010 From: oi-svn at pardus.org.tr (=?utf-8?b?R8O2a21lbiBHw7ZyZ2Vu?=) Date: Wed, 15 Dec 2010 22:09:24 +0200 (EET) Subject: [Oi-commits] trunk - remove filebrowser from urls. Message-ID: <20101215200924.7C9D449C950@ns1.pardus.org.tr> Author: gkmngrgn Date: Wed Dec 15 22:09:24 2010 New Revision: 3631 Modified: trunk/urls.py Log: remove filebrowser from urls. --- urls.py | 1 - 1 file changed, 1 deletion(-) Modified: trunk/urls.py ================================================================= --- trunk/urls.py (original) +++ trunk/urls.py Wed Dec 15 22:09:24 2010 @@ -209,7 +209,6 @@ (r'^admin/upload_progress/$', 'oi.upload.views.upload_progress'), (r'^admin/upload/image/tinymce/$', 'oi.upload.views.image_upload'), (r'^admin/', include(admin.site.urls)), - (r'^admin/filebrowser/', include('filebrowser.urls')), (r'^media/(.*)$', 'django.views.static.serve', {'document_root': '%s/media' % DOCUMENT_ROOT, 'show_indexes': True}), #Feeds From oi-svn at pardus.org.tr Wed Dec 15 22:17:02 2010 From: oi-svn at pardus.org.tr (=?utf-8?q?=C4=B0lker_Kesen?=) Date: Wed, 15 Dec 2010 22:17:02 +0200 (EET) Subject: [Oi-commits] trunk - fix media dir problem Message-ID: <20101215201702.E0B9F49C950@ns1.pardus.org.tr> Author: ilker Date: Wed Dec 15 22:17:02 2010 New Revision: 3632 Modified: trunk/settings.py Log: fix media dir problem --- settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: trunk/settings.py ================================================================= --- trunk/settings.py (original) +++ trunk/settings.py Wed Dec 15 22:17:02 2010 @@ -75,7 +75,7 @@ MEDIA_ROOT = '%s/media/' % DOCUMENT_ROOT MEDIA_URL = '%s/media/' % WEB_URL -ADMIN_MEDIA_PREFIX = '/media/admin/' +ADMIN_MEDIA_PREFIX = '%s/media/' % WEB_URL WEBALIZER_DIR = '' SECRET_KEY = 'n9-*x3!&!(x*z_!13)cyxil4fh+ov_+3!y($&4t7iit=)d)=93' From oi-svn at pardus.org.tr Wed Dec 15 23:03:28 2010 From: oi-svn at pardus.org.tr (=?utf-8?b?R8O2a21lbiBHw7ZyZ2Vu?=) Date: Wed, 15 Dec 2010 23:03:28 +0200 (EET) Subject: [Oi-commits] trunk/media/js - add new jquery Message-ID: <20101215210328.2E18749C950@ns1.pardus.org.tr> Author: gkmngrgn Date: Wed Dec 15 23:03:27 2010 New Revision: 3633 Added: trunk/media/js/jquery-1.4.4.min.js trunk/media/js/jquery.min.js (contents, props changed) Log: add new jquery --- jquery-1.4.4.min.js | 167 ++++++++++++++++++++++++++++++++++++++++++++++++++++ jquery.min.js | 1 2 files changed, 168 insertions(+) From oi-svn at pardus.org.tr Wed Dec 15 23:49:33 2010 From: oi-svn at pardus.org.tr (=?utf-8?b?R8O2a21lbiBHw7ZyZ2Vu?=) Date: Wed, 15 Dec 2010 23:49:33 +0200 (EET) Subject: [Oi-commits] branches/oi-non-grappelli - oi without grappelli Message-ID: <20101215214933.DCFE349C950@ns1.pardus.org.tr> Author: gkmngrgn Date: Wed Dec 15 23:49:33 2010 New Revision: 3634 Added: branches/oi-non-grappelli/ - copied from r3633, trunk/ Log: oi without grappelli From oi-svn at pardus.org.tr Thu Dec 16 17:29:12 2010 From: oi-svn at pardus.org.tr (=?utf-8?q?=C4=B0lker_Kesen?=) Date: Thu, 16 Dec 2010 17:29:12 +0200 (EET) Subject: [Oi-commits] trunk/tema - merge from revision 3630 Message-ID: <20101216152912.39DC149C950@ns1.pardus.org.tr> Author: ilker Date: Thu Dec 16 17:29:11 2010 New Revision: 3636 Modified: trunk/tema/admin.py Log: merge from revision 3630 --- admin.py | 45 +++++++++++++++++++++++++++++++++++++++------ 1 file changed, 39 insertions(+), 6 deletions(-) Modified: trunk/tema/admin.py ================================================================= --- trunk/tema/admin.py (original) +++ trunk/tema/admin.py Thu Dec 16 17:29:11 2010 @@ -25,9 +25,9 @@ search_fields = ["title", "text", "changelog"] class Media: - js = ("js/jquery-1.4.2.min.js", "js/temaimages.js", "js/jquery.autocomplete.js", "js/taghelper.js") + js = ("js/jquery-1.2.6.min.js", "js/temaimages.js", "js/jquery.autocomplete.js", "js/taghelper.js") css = { - "all": ("css/new/grappelli.autocomplete.css",), + "all": ("css/new/autocomplete.css",), } class WallpaperAdmin(ThemeItemAdmin): @@ -72,12 +72,45 @@ class IconSetAdmin(ThemeItemAdmin): list_display = ("title", "author", "license", "status") + fieldsets = ( + (None, { + "fields": ("thumbnail", "title", "slug", "version", + "origin_url", "text", "changelog", "screenshot", "file", + "status", "deny_reason", "tags") + }), + ("Di?er", { + "classes": "collapse", + "fields": ("author", "license", "rating", "download_count", "submit", "update", "comment_enabled") + }), + ) - #class OpenOfficeThemeAdmin(ThemeItemAdmin): -# list_display = ("title", "version", "author", "license", "status") +class OpenOfficeThemeAdmin(ThemeItemAdmin): + list_display = ("title", "author", "license", "status") + fieldsets = ( + (None, { + "fields": ("thumbnail", "title", "slug", "version", + "origin_url", "text", "changelog", "screenshot", "file", + "status", "deny_reason", "tags") + }), + ("Di?er", { + "classes": "collapse", + "fields": ("author", "license", "rating", "download_count", "submit", "update", "comment_enabled") + }) + ) class PackageScreenshotAdmin(ThemeItemAdmin): list_display = ("title", "version", "author", "license", "status") + fieldsets = ( + (None, { + "fields": ("thumbnail", "title", "slug", "version", + "text", "changelog", "image", "s_image", "status", + "deny_reason", "tags") + }), + ("Di?er", { + "classes": "collapse", + "fields": ("author", "license", "rating", "download_count", "submit", "update", "comment_enabled") + }) + ) class CategoryAdmin(admin.ModelAdmin): prepopulated_fields = {"slug": ("name",)} @@ -89,7 +122,7 @@ admin.site.register(WallpaperFile, admin.ModelAdmin) admin.site.register(License, admin.ModelAdmin) admin.site.register(WallpaperCategory, CategoryAdmin) -admin.site.register(OpenOfficeThemeCategory) -admin.site.register(OpenOfficeTheme) +admin.site.register(OpenOfficeThemeCategory, CategoryAdmin) +admin.site.register(OpenOfficeTheme, OpenOfficeThemeAdmin) admin.site.register(IconSet,IconSetAdmin) admin.site.register(PackageScreenshot, PackageScreenshotAdmin) From oi-svn at pardus.org.tr Thu Dec 16 17:30:40 2010 From: oi-svn at pardus.org.tr (=?utf-8?q?=C4=B0lker_Kesen?=) Date: Thu, 16 Dec 2010 17:30:40 +0200 (EET) Subject: [Oi-commits] trunk/tema - fix media files Message-ID: <20101216153040.BF47449C950@ns1.pardus.org.tr> Author: ilker Date: Thu Dec 16 17:30:40 2010 New Revision: 3637 Modified: trunk/tema/admin.py Log: fix media files --- admin.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: trunk/tema/admin.py ================================================================= --- trunk/tema/admin.py (original) +++ trunk/tema/admin.py Thu Dec 16 17:30:40 2010 @@ -25,9 +25,9 @@ search_fields = ["title", "text", "changelog"] class Media: - js = ("js/jquery-1.2.6.min.js", "js/temaimages.js", "js/jquery.autocomplete.js", "js/taghelper.js") + js = ("js/jquery-1.4.2.min.js", "js/temaimages.js", "js/jquery.autocomplete.js", "js/taghelper.js") css = { - "all": ("css/new/autocomplete.css",), + "all": ("css/new/grappelli.autocomplete.css",), } class WallpaperAdmin(ThemeItemAdmin): From oi-svn at pardus.org.tr Thu Dec 16 18:33:12 2010 From: oi-svn at pardus.org.tr (=?utf-8?q?=C4=B0lker_Kesen?=) Date: Thu, 16 Dec 2010 18:33:12 +0200 (EET) Subject: [Oi-commits] trunk/templates/tema - fix category count bug Message-ID: <20101216163312.6E58749CA22@ns1.pardus.org.tr> Author: ilker Date: Thu Dec 16 18:33:12 2010 New Revision: 3638 Modified: trunk/templates/tema/base.html Log: fix category count bug --- base.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: trunk/templates/tema/base.html ================================================================= --- trunk/templates/tema/base.html (original) +++ trunk/templates/tema/base.html Thu Dec 16 18:33:12 2010 @@ -28,7 +28,7 @@
  • Kategoriler
  • Hepsi
    • {% for sub_category in sub_categories %} -
  • {{sub_category.name}} ({{sub_categories.count}})
    • +
  • {{sub_category.name}} ({{sub_category.count}})
    • {% endfor %}
  • From oi-svn at pardus.org.tr Thu Dec 16 18:37:42 2010 From: oi-svn at pardus.org.tr (=?utf-8?q?=C4=B0lker_Kesen?=) Date: Thu, 16 Dec 2010 18:37:42 +0200 (EET) Subject: trunk/tema - özelleştirme -> öğe Message-ID: <20101216163742.F252849CA22@ns1.pardus.org.tr> Author: ilker Date: Thu Dec 16 18:37:42 2010 New Revision: 3639 Modified: trunk/tema/models.py Log: ?zelle?tirme -> ??e --- models.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: trunk/tema/models.py ================================================================= --- trunk/tema/models.py (original) +++ trunk/tema/models.py Thu Dec 16 18:37:42 2010 @@ -231,8 +231,8 @@ category = models.ForeignKey("OpenOfficeThemeCategory", verbose_name="Kategori") class Meta: - verbose_name = "Open Office ?zelle?tirmesi" - verbose_name_plural = "Open Office ?zelle?tirmeleri" + verbose_name = "Open Office ??esi" + verbose_name_plural = "Open Office ??eleri" def get_absolute_url(self): return "/tema/open-office/detay/%s/" % (self.slug) From oi-svn at pardus.org.tr Fri Dec 17 12:02:24 2010 From: oi-svn at pardus.org.tr (=?utf-8?q?=C4=B0lker_Kesen?=) Date: Fri, 17 Dec 2010 12:02:24 +0200 (EET) Subject: trunk/grappelli/media/img - true/false bug fixed, images changed (gökmen köt... Message-ID: <20101217100224.BF49C49C950@ns1.pardus.org.tr> Author: ilker Date: Fri Dec 17 12:02:24 2010 New Revision: 3640 Added: trunk/grappelli/media/img/admin/ trunk/grappelli/media/img/admin/icon-no.gif (contents, props changed) trunk/grappelli/media/img/admin/icon-yes.gif (contents, props changed) Modified: trunk/grappelli/media/img/icons/icon-no.png trunk/grappelli/media/img/icons/icon-yes.png Log: true/false bug fixed, images changed (g?kmen k?t? bir ??z?m biliyorum, ?imdilik b?yle dursun) Modified: trunk/grappelli/media/img/icons/icon-no.png ================================================================= Binary files. No diff available. Modified: trunk/grappelli/media/img/icons/icon-yes.png ================================================================= Binary files. No diff available. From oi-svn at pardus.org.tr Fri Dec 17 18:54:48 2010 From: oi-svn at pardus.org.tr (=?utf-8?q?=C4=B0lker_Kesen?=) Date: Fri, 17 Dec 2010 18:54:48 +0200 (EET) Subject: [Oi-commits] trunk/grappelli/media/css - fix for #56 Message-ID: <20101217165448.8196149C950@ns1.pardus.org.tr> Author: ilker Date: Fri Dec 17 18:54:48 2010 New Revision: 3641 Modified: trunk/grappelli/media/css/forms.css Log: fix for #56 --- forms.css | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) Modified: trunk/grappelli/media/css/forms.css ================================================================= --- trunk/grappelli/media/css/forms.css (original) +++ trunk/grappelli/media/css/forms.css Fri Dec 17 18:54:48 2010 @@ -28,7 +28,9 @@ margin-top: -3px; } - +.image_filter { + margin-left:10px; +} /* Errors ------------------------------------------------------------------------------------------------------ */ From oi-svn at pardus.org.tr Mon Dec 20 18:05:23 2010 From: oi-svn at pardus.org.tr (=?utf-8?q?=C4=B0lker_Kesen?=) Date: Mon, 20 Dec 2010 18:05:23 +0200 (EET) Subject: [Oi-commits] trunk/grappelli/media/tinymce/jscripts/tiny_mce - turkish language files added Message-ID: <20101220160523.C9BFD49C8C8@ns1.pardus.org.tr> Author: ilker Date: Mon Dec 20 18:05:23 2010 New Revision: 3642 Added: trunk/grappelli/media/tinymce/jscripts/tiny_mce/langs/tr.js trunk/grappelli/media/tinymce/jscripts/tiny_mce/plugins/advhr/langs/tr_dlg.js trunk/grappelli/media/tinymce/jscripts/tiny_mce/plugins/advimage/langs/tr_dlg.js trunk/grappelli/media/tinymce/jscripts/tiny_mce/plugins/advlink/langs/tr_dlg.js trunk/grappelli/media/tinymce/jscripts/tiny_mce/plugins/autosave/langs/tr.js trunk/grappelli/media/tinymce/jscripts/tiny_mce/plugins/emotions/langs/tr_dlg.js trunk/grappelli/media/tinymce/jscripts/tiny_mce/plugins/fullpage/langs/tr_dlg.js trunk/grappelli/media/tinymce/jscripts/tiny_mce/plugins/grappelli/langs/tr.js trunk/grappelli/media/tinymce/jscripts/tiny_mce/plugins/grappelli_contextmenu/langs/tr.js trunk/grappelli/media/tinymce/jscripts/tiny_mce/plugins/media/langs/tr_dlg.js trunk/grappelli/media/tinymce/jscripts/tiny_mce/plugins/paste/langs/tr_dlg.js trunk/grappelli/media/tinymce/jscripts/tiny_mce/plugins/searchreplace/langs/tr_dlg.js trunk/grappelli/media/tinymce/jscripts/tiny_mce/plugins/style/langs/tr_dlg.js trunk/grappelli/media/tinymce/jscripts/tiny_mce/plugins/table/langs/tr_dlg.js trunk/grappelli/media/tinymce/jscripts/tiny_mce/plugins/template/langs/tr_dlg.js trunk/grappelli/media/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/langs/tr_dlg.js trunk/grappelli/media/tinymce/jscripts/tiny_mce/themes/advanced/langs/tr.js trunk/grappelli/media/tinymce/jscripts/tiny_mce/themes/advanced/langs/tr_dlg.js trunk/grappelli/media/tinymce/jscripts/tiny_mce/themes/simple/langs/tr.js Log: turkish language files added --- langs/tr.js | 170 ++++++++++++++++++++++++++++++ plugins/advhr/langs/tr_dlg.js | 5 plugins/advimage/langs/tr_dlg.js | 43 +++++++ plugins/advlink/langs/tr_dlg.js | 52 +++++++++ plugins/autosave/langs/tr.js | 4 plugins/emotions/langs/tr_dlg.js | 20 +++ plugins/fullpage/langs/tr_dlg.js | 85 +++++++++++++++ plugins/grappelli/langs/tr.js | 4 plugins/grappelli_contextmenu/langs/tr.js | 20 +++ plugins/media/langs/tr_dlg.js | 103 ++++++++++++++++++ plugins/paste/langs/tr_dlg.js | 5 plugins/searchreplace/langs/tr_dlg.js | 16 ++ plugins/style/langs/tr_dlg.js | 63 +++++++++++ plugins/table/langs/tr_dlg.js | 74 +++++++++++++ plugins/template/langs/tr_dlg.js | 15 ++ plugins/xhtmlxtras/langs/tr_dlg.js | 32 +++++ themes/advanced/langs/tr.js | 62 ++++++++++ themes/advanced/langs/tr_dlg.js | 51 +++++++++ themes/simple/langs/tr.js | 11 + 19 files changed, 835 insertions(+) From oi-svn at pardus.org.tr Mon Dec 20 18:07:50 2010 From: oi-svn at pardus.org.tr (=?utf-8?q?=C4=B0lker_Kesen?=) Date: Mon, 20 Dec 2010 18:07:50 +0200 (EET) Subject: [Oi-commits] trunk/media/js - turkish language support enabled, set entity_encod... Message-ID: <20101220160750.A4EEC49C8C8@ns1.pardus.org.tr> Author: ilker Date: Mon Dec 20 18:07:50 2010 New Revision: 3643 Modified: trunk/media/js/tinymce_setup.js Log: turkish language support enabled, set entity_encoding raw. fix for #60? (maybe #64, i am gonna try) --- tinymce_setup.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) Modified: trunk/media/js/tinymce_setup.js ================================================================= --- trunk/media/js/tinymce_setup.js (original) +++ trunk/media/js/tinymce_setup.js Mon Dec 20 18:07:50 2010 @@ -36,7 +36,8 @@ dialog_type: 'window', editor_deselector: 'mceNoEditor', keep_styles : false, - language: 'en', + entity_encoding: 'raw', + language: 'tr', object_resizing: false, media_strict: true, From oi-svn at pardus.org.tr Mon Dec 20 18:31:09 2010 From: oi-svn at pardus.org.tr (=?utf-8?q?=C4=B0lker_Kesen?=) Date: Mon, 20 Dec 2010 18:31:09 +0200 (EET) Subject: [Oi-commits] trunk/media/css/new - fix for #64 Message-ID: <20101220163109.9B77749C8C8@ns1.pardus.org.tr> Author: ilker Date: Mon Dec 20 18:31:09 2010 New Revision: 3644 Modified: trunk/media/css/new/base.css Log: fix for #64 --- base.css | 9 +++++++++ 1 file changed, 9 insertions(+) Modified: trunk/media/css/new/base.css ================================================================= --- trunk/media/css/new/base.css (original) +++ trunk/media/css/new/base.css Mon Dec 20 18:31:09 2010 @@ -19,6 +19,15 @@ border: 0px; behavior: url(/media/css/new/iepngfix.htc); } + +.img_right_nospacetop { + float: right; +} + +.img_left_nospacetop { + float: left; +} + body { background-color: #EAEAEA; font-family: sans-serif; From oi-svn at pardus.org.tr Tue Dec 21 01:49:18 2010 From: oi-svn at pardus.org.tr (=?utf-8?q?=C4=B0lker_Kesen?=) Date: Tue, 21 Dec 2010 01:49:18 +0200 (EET) Subject: [Oi-commits] trunk/grappelli/media/tinymce/jscripts/tiny_mce/plugins - now grappelli's tinyMCE is totally turkish Message-ID: <20101220234918.CB17649CB3F@ns1.pardus.org.tr> Author: ilker Date: Tue Dec 21 01:49:18 2010 New Revision: 3645 Modified: trunk/grappelli/media/tinymce/jscripts/tiny_mce/plugins/autosave/langs/tr.js trunk/grappelli/media/tinymce/jscripts/tiny_mce/plugins/grappelli/langs/tr.js trunk/grappelli/media/tinymce/jscripts/tiny_mce/plugins/grappelli_contextmenu/langs/tr.js Log: now grappelli's tinyMCE is totally turkish --- autosave/langs/tr.js | 4 ++-- grappelli/langs/tr.js | 4 ++-- grappelli_contextmenu/langs/tr.js | 32 ++++++++++++++++---------------- 3 files changed, 20 insertions(+), 20 deletions(-) Modified: trunk/grappelli/media/tinymce/jscripts/tiny_mce/plugins/autosave/langs/tr.js ================================================================= --- trunk/grappelli/media/tinymce/jscripts/tiny_mce/plugins/autosave/langs/tr.js (original) +++ trunk/grappelli/media/tinymce/jscripts/tiny_mce/plugins/autosave/langs/tr.js Tue Dec 21 01:49:18 2010 @@ -1,4 +1,4 @@ tinyMCE.addI18n('tr.autosave',{ -restore_content: "Restore auto-saved content", -warning_message: "If you restore the saved content, you will lose all the content that is currently in the editor.\n\nAre you sure you want to restore the saved content?" +restore_content: "Otomatik kaydedilmi? i?eri?i geri getir", +warning_message: "Kaydedilmi? i?eri?i geri getirirsiniz, edit?rde mevcut olan t?m i?eri?i kaybedeceksiniz.\n\nBu i?leme devam etmek istiyor musunuz?" }); Modified: trunk/grappelli/media/tinymce/jscripts/tiny_mce/plugins/grappelli/langs/tr.js ================================================================= --- trunk/grappelli/media/tinymce/jscripts/tiny_mce/plugins/grappelli/langs/tr.js (original) +++ trunk/grappelli/media/tinymce/jscripts/tiny_mce/plugins/grappelli/langs/tr.js Tue Dec 21 01:49:18 2010 @@ -1,4 +1,4 @@ tinyMCE.addI18n("tr.grappelli",{ -grappelli_adv_desc:"Show/Hide Advanced Menu", -grappelli_documentstructure_desc:"Show/Hide Document Structure", +grappelli_adv_desc:"Geli?mi? Men?y? G?ster/Gizle", +grappelli_documentstructure_desc:"Belge Yap?s?n? G?ster/Gizle", }); Modified: trunk/grappelli/media/tinymce/jscripts/tiny_mce/plugins/grappelli_contextmenu/langs/tr.js ================================================================= --- trunk/grappelli/media/tinymce/jscripts/tiny_mce/plugins/grappelli_contextmenu/langs/tr.js (original) +++ trunk/grappelli/media/tinymce/jscripts/tiny_mce/plugins/grappelli_contextmenu/langs/tr.js Tue Dec 21 01:49:18 2010 @@ -1,20 +1,20 @@ tinyMCE.addI18n("tr.grappelli_contextmenu",{ -grappelli_contextmenu_insertpbefore_desc:"Insert Paragraph BEFORE current element", -grappelli_contextmenu_insertpafter_desc:"Insert Paragraph AFTER current element", -grappelli_contextmenu_insertpbeforeroot_desc:"Insert Paragraph BEFORE current ROOT-LEVEL element", -grappelli_contextmenu_insertpafterroot_desc:"Insert Paragraph AFTER current ROOT-LEVEL element", -grappelli_contextmenu_delete_desc:"Delete current element", -grappelli_contextmenu_deleteroot_desc:"Delete current ROOT-LEVEL element", -grappelli_contextmenu_moveup_desc:"MOVE UP current ELEMENT", -grappelli_contextmenu_moveuproot_desc:"MOVE UP current ROOT-LEVEL element", +grappelli_contextmenu_insertpbefore_desc:"?n?ne paragraf ekle", +grappelli_contextmenu_insertpafter_desc:"Arkas?na paragraf ekle", +grappelli_contextmenu_insertpbeforeroot_desc:"?n?ne paragraf ekle", +grappelli_contextmenu_insertpafterroot_desc:"Arkas?na paragraf ekle", +grappelli_contextmenu_delete_desc:"Sil", +grappelli_contextmenu_deleteroot_desc:"Sil", +grappelli_contextmenu_moveup_desc:"Yukar? ta??", +grappelli_contextmenu_moveuproot_desc:"Yukar? ta??", -P_grappelli_contextmenu_insertpbefore_desc:"Insert Paragraph BEFORE current element", -P_grappelli_contextmenu_insertpafter_desc:"Insert Paragraph AFTER current element", -P_grappelli_contextmenu_insertpbeforeroot_desc:"Insert Paragraph BEFORE current ROOT-LEVEL element", -P_grappelli_contextmenu_insertpafterroot_desc:"Insert Paragraph AFTER current ROOT-LEVEL element", -P_grappelli_contextmenu_delete_desc:"Delete current element", -P_grappelli_contextmenu_deleteroot_desc:"Delete current ROOT-LEVEL element", -P_grappelli_contextmenu_moveup_desc:"MOVE UP current ELEMENT", -P_grappelli_contextmenu_moveuproot_desc:"MOVE UP current ROOT-LEVEL element", +P_grappelli_contextmenu_insertpbefore_desc:"?n?ne paragraf ekle", +P_grappelli_contextmenu_insertpafter_desc:"Arkas?na paragraf ekle", +P_grappelli_contextmenu_insertpbeforeroot_desc:"?n?ne paragraf ekle", +P_grappelli_contextmenu_insertpafterroot_desc:"Arkas?na paragraf ekle", +P_grappelli_contextmenu_delete_desc:"Sil", +P_grappelli_contextmenu_deleteroot_desc:"Sil", +P_grappelli_contextmenu_moveup_desc:"Yukar? ta??", +P_grappelli_contextmenu_moveuproot_desc:"Yukar? ta??", }); From oi-svn at pardus.org.tr Tue Dec 21 17:14:14 2010 From: oi-svn at pardus.org.tr (=?utf-8?q?=C4=B0lker_Kesen?=) Date: Tue, 21 Dec 2010 17:14:14 +0200 (EET) Subject: [Oi-commits] trunk/tema - fix for #54, now it works Message-ID: <20101221151414.A561449C8DA@ns1.pardus.org.tr> Author: ilker Date: Tue Dec 21 17:14:14 2010 New Revision: 3646 Modified: trunk/tema/urls.py Log: fix for #54, now it works --- urls.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: trunk/tema/urls.py ================================================================= --- trunk/tema/urls.py (original) +++ trunk/tema/urls.py Tue Dec 21 17:14:14 2010 @@ -47,7 +47,7 @@ (r'^khotnewstuff/wallpaper/wallpaper-downloads.xml$', 'ghns_wallpaper_downloads'), (r'^yonetim/$', 'themeitem_queue'), #(r'^listele/(?P[a-z0-9-_]+)/(?P[a-z0-9-_]+)/$','themeitem_sort'), - (r'^yazitipleri/(?P[a-z0-9-_]+)/onizle/(?P.{1,20})/$','font_image'), + (r'^yazitipleri/detay/(?P[a-z0-9-_]+)/onizle/(?P.{1,20})/$','font_image'), #category listings (r'^([a-z0-9-_]+)?/$','themeitem_list'), (r'^([a-z0-9-_]+)/([a-z0-9-_]+)/$','themeitem_list'), From oi-svn at pardus.org.tr Wed Dec 22 02:42:44 2010 From: oi-svn at pardus.org.tr (=?utf-8?b?R8O2a21lbiBHw7ZyZ2Vu?=) Date: Wed, 22 Dec 2010 02:42:44 +0200 (EET) Subject: [Oi-commits] trunk - we should create new empty directory for fixing un... Message-ID: <20101222004244.8797F49CC06@ns1.pardus.org.tr> Author: gkmngrgn Date: Wed Dec 22 02:42:43 2010 New Revision: 3647 Added: trunk/media/uploads/ Modified: trunk/settings.py Log: we should create new empty directory for fixing unicode error. --- settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: trunk/settings.py ================================================================= --- trunk/settings.py (original) +++ trunk/settings.py Wed Dec 22 02:42:43 2010 @@ -234,4 +234,4 @@ ) GRAPPELLI_ADMIN_TITLE = "?zg?rl?k??in" -FILEBROWSER_DIRECTORY = "upload/" +FILEBROWSER_DIRECTORY = "uploads/" From oi-svn at pardus.org.tr Wed Dec 22 18:25:45 2010 From: oi-svn at pardus.org.tr (=?utf-8?q?=C4=B0lker_Kesen?=) Date: Wed, 22 Dec 2010 18:25:45 +0200 (EET) Subject: [Oi-commits] trunk/tema - remove stupid lines Message-ID: <20101222162545.E98B249C90E@ns1.pardus.org.tr> Author: ilker Date: Wed Dec 22 18:25:45 2010 New Revision: 3648 Modified: trunk/tema/views.py Log: remove stupid lines --- views.py | 2 -- 1 file changed, 2 deletions(-) Modified: trunk/tema/views.py ================================================================= --- trunk/tema/views.py (original) +++ trunk/tema/views.py Wed Dec 22 18:25:45 2010 @@ -276,9 +276,7 @@ item = form.save(commit=False) item.author = request.user item.submit = item.update = datetime.datetime.now() - item.slug = "somekindof unique value" slug = slugify(replace_turkish(item.title)) - print slug item.save() for tag in form.cleaned_data["tags"]: t = Tag.objects.get(name=tag) From oi-svn at pardus.org.tr Wed Dec 22 18:33:42 2010 From: oi-svn at pardus.org.tr (=?utf-8?q?=C4=B0lker_Kesen?=) Date: Wed, 22 Dec 2010 18:33:42 +0200 (EET) Subject: [Oi-commits] trunk - disable shipit app for a while Message-ID: <20101222163342.1B7F949C90E@ns1.pardus.org.tr> Author: ilker Date: Wed Dec 22 18:33:41 2010 New Revision: 3649 Modified: trunk/templates/menu.html trunk/urls.py Log: disable shipit app for a while --- templates/menu.html | 14 +++++++------- urls.py | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) Modified: trunk/templates/menu.html ================================================================= --- trunk/templates/menu.html (original) +++ trunk/templates/menu.html Wed Dec 22 18:33:41 2010 @@ -21,13 +21,13 @@ Forum At?lye - - CD G?nder - - - Ajans Pardus + + + Ajans Pardus Modified: trunk/urls.py ================================================================= --- trunk/urls.py (original) +++ trunk/urls.py Wed Dec 22 18:33:41 2010 @@ -190,7 +190,7 @@ (r'^e-dergi/', include('oi.ezine.urls')), #Shipit - (r'^cdgonder/', include('oi.shipit.urls')), + #(r'^cdgonder/', include('oi.shipit.urls')), #Piyango (r'^piyango/', include('oi.piyango.urls')), From oi-svn at pardus.org.tr Wed Dec 22 18:44:18 2010 From: oi-svn at pardus.org.tr (=?utf-8?q?=C4=B0lker_Kesen?=) Date: Wed, 22 Dec 2010 18:44:18 +0200 (EET) Subject: [Oi-commits] trunk/templates/forum - eliminate shipit image, it has been disabled Message-ID: <20101222164418.E155449C90E@ns1.pardus.org.tr> Author: ilker Date: Wed Dec 22 18:44:18 2010 New Revision: 3650 Modified: trunk/templates/forum/forum_base.html Log: eliminate shipit image, it has been disabled --- forum_base.html | 2 ++ 1 file changed, 2 insertions(+) Modified: trunk/templates/forum/forum_base.html ================================================================= --- trunk/templates/forum/forum_base.html (original) +++ trunk/templates/forum/forum_base.html Wed Dec 22 18:44:18 2010 @@ -63,7 +63,9 @@
    +
    {% block sidebar_bottom %} {% endblock %} From oi-svn at pardus.org.tr Wed Dec 22 19:03:23 2010 From: oi-svn at pardus.org.tr (=?utf-8?q?=C4=B0lker_Kesen?=) Date: Wed, 22 Dec 2010 19:03:23 +0200 (EET) Subject: [Oi-commits] trunk/templates - eliminate shipit banners from sidebars Message-ID: <20101222170323.B273049CCC7@ns1.pardus.org.tr> Author: ilker Date: Wed Dec 22 19:03:23 2010 New Revision: 3651 Modified: trunk/templates/beyin2/idea_base.html trunk/templates/feedjack/oi/post_list.html trunk/templates/tema/theme_base_without_ezine.html Log: eliminate shipit banners from sidebars --- beyin2/idea_base.html | 2 ++ feedjack/oi/post_list.html | 2 ++ tema/theme_base_without_ezine.html | 2 ++ 3 files changed, 6 insertions(+) Modified: trunk/templates/beyin2/idea_base.html ================================================================= --- trunk/templates/beyin2/idea_base.html (original) +++ trunk/templates/beyin2/idea_base.html Wed Dec 22 19:03:23 2010 @@ -87,7 +87,9 @@ {% endblock %}
    +
    {% block sidebar_bottom %} {% endblock %} Modified: trunk/templates/feedjack/oi/post_list.html ================================================================= --- trunk/templates/feedjack/oi/post_list.html (original) +++ trunk/templates/feedjack/oi/post_list.html Wed Dec 22 19:03:23 2010 @@ -64,6 +64,8 @@

    {{ last_modified }}

    +
    {% endblock %} Modified: trunk/templates/tema/theme_base_without_ezine.html ================================================================= --- trunk/templates/tema/theme_base_without_ezine.html (original) +++ trunk/templates/tema/theme_base_without_ezine.html Wed Dec 22 19:03:23 2010 @@ -79,7 +79,9 @@
    +
    {% block rightcolumn_bottom %} {% endblock %} From oi-svn at pardus.org.tr Thu Dec 23 16:52:40 2010 From: oi-svn at pardus.org.tr (=?utf-8?q?=C4=B0lker_Kesen?=) Date: Thu, 23 Dec 2010 16:52:40 +0200 (EET) Subject: [Oi-commits] trunk/templates - remove shipit link from footer menu Message-ID: <20101223145240.47D0E49CC06@ns1.pardus.org.tr> Author: ilker Date: Thu Dec 23 16:52:39 2010 New Revision: 3652 Modified: trunk/templates/footer.html Log: remove shipit link from footer menu --- footer.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: trunk/templates/footer.html ================================================================= --- trunk/templates/footer.html (original) +++ trunk/templates/footer.html Thu Dec 23 16:52:39 2010 @@ -13,6 +13,6 @@
    ?lk Ad?mlar
    Nas?l
    Paketler
    Oyunlar
    Haberler
    Beyin
    Gezegen
    Temalar
    -
    Forum
    At?lye
    CD G?nder
    Ajans
    +
    Forum
    At?lye
    Ajans
    From oi-svn at pardus.org.tr Thu Dec 23 16:55:57 2010 From: oi-svn at pardus.org.tr (=?utf-8?q?=C4=B0lker_Kesen?=) Date: Thu, 23 Dec 2010 16:55:57 +0200 (EET) Subject: [Oi-commits] trunk/templates/tema - fix tr char bug Message-ID: <20101223145557.8FF3149CC06@ns1.pardus.org.tr> Author: ilker Date: Thu Dec 23 16:55:57 2010 New Revision: 3653 Modified: trunk/templates/tema/themeitem_openofficetheme_detail.html Log: fix tr char bug --- themeitem_openofficetheme_detail.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: trunk/templates/tema/themeitem_openofficetheme_detail.html ================================================================= --- trunk/templates/tema/themeitem_openofficetheme_detail.html (original) +++ trunk/templates/tema/themeitem_openofficetheme_detail.html Thu Dec 23 16:55:57 2010 @@ -50,7 +50,7 @@ Lisans: {{ object.license.name }}
    G?nderildi?i Tarih: {{ object.submit|date:"d F Y" }}
    ?ndirilme Say?s?: {{ object.download_count }}
    - Kategori: {{object.category.name.title}}
    + Kategori: {{object.category.name}}
    {% if object.origin_url %}?zg?n ?al??ma
    {% endif %}

    From oi-svn at pardus.org.tr Thu Dec 23 17:05:27 2010 From: oi-svn at pardus.org.tr (=?utf-8?q?=C4=B0lker_Kesen?=) Date: Thu, 23 Dec 2010 17:05:27 +0200 (EET) Subject: [Oi-commits] trunk/tema - include version field into openofficetheme and ico... Message-ID: <20101223150527.9FC8049CC06@ns1.pardus.org.tr> Author: ilker Date: Thu Dec 23 17:05:27 2010 New Revision: 3654 Modified: trunk/tema/forms.py Log: include version field into openofficetheme and iconset forms --- forms.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: trunk/tema/forms.py ================================================================= --- trunk/tema/forms.py (original) +++ trunk/tema/forms.py Thu Dec 23 17:05:27 2010 @@ -159,7 +159,7 @@ class Meta: model = OpenOfficeTheme exclude = ("author", "rating", "thumbnail", - "download_count", "submit", "update", "status", "deny_reason", "scalable", "changelog", "slug", "topic", "version") + "download_count", "submit", "update", "status", "deny_reason", "scalable", "changelog", "slug", "topic") def clean_tags(self): field_data = self.cleaned_data['tags'] @@ -177,7 +177,7 @@ class Meta: model = IconSet exclude = ("author", "rating", "thumbnail", - "download_count", "submit", "update", "status", "deny_reason", "scalable", "changelog", "slug", "topic", "version") + "download_count", "submit", "update", "status", "deny_reason", "scalable", "changelog", "slug", "topic") def clean_tags(self): field_data = self.cleaned_data['tags'] From oi-svn at pardus.org.tr Thu Dec 23 17:10:53 2010 From: oi-svn at pardus.org.tr (=?utf-8?q?=C4=B0lker_Kesen?=) Date: Thu, 23 Dec 2010 17:10:53 +0200 (EET) Subject: [Oi-commits] trunk/templates/tema - include version to openoffice and iconset template... Message-ID: <20101223151054.2942E49C93F@ns1.pardus.org.tr> Author: ilker Date: Thu Dec 23 17:10:52 2010 New Revision: 3655 Modified: trunk/templates/tema/themeitem_iconset_detail.html trunk/templates/tema/themeitem_openofficetheme_detail.html Log: include version to openoffice and iconset templates --- themeitem_iconset_detail.html | 2 +- themeitem_openofficetheme_detail.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) Modified: trunk/templates/tema/themeitem_iconset_detail.html ================================================================= --- trunk/templates/tema/themeitem_iconset_detail.html (original) +++ trunk/templates/tema/themeitem_iconset_detail.html Thu Dec 23 17:10:52 2010 @@ -19,7 +19,7 @@
    -
    {{ object.title }}
    +
    {{ object.title }} {{ object.version }}
    {{ object.author }}
    Modified: trunk/templates/tema/themeitem_openofficetheme_detail.html ================================================================= --- trunk/templates/tema/themeitem_openofficetheme_detail.html (original) +++ trunk/templates/tema/themeitem_openofficetheme_detail.html Thu Dec 23 17:10:52 2010 @@ -19,7 +19,7 @@
    -
    {{ object.title }}
    +
    {{ object.title }} {{ object.version }}
    {{ object.author }}
    From oi-svn at pardus.org.tr Thu Dec 23 17:22:51 2010 From: oi-svn at pardus.org.tr (=?utf-8?q?=C4=B0lker_Kesen?=) Date: Thu, 23 Dec 2010 17:22:51 +0200 (EET) Subject: trunk/templates/tema - özgün çalışma -> web sitesi Message-ID: <20101223152251.538EA49C93F@ns1.pardus.org.tr> Author: ilker Date: Thu Dec 23 17:22:51 2010 New Revision: 3656 Modified: trunk/templates/tema/themeitem_openofficetheme_detail.html Log: ?zg?n ?al??ma -> web sitesi --- themeitem_openofficetheme_detail.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: trunk/templates/tema/themeitem_openofficetheme_detail.html ================================================================= --- trunk/templates/tema/themeitem_openofficetheme_detail.html (original) +++ trunk/templates/tema/themeitem_openofficetheme_detail.html Thu Dec 23 17:22:51 2010 @@ -51,7 +51,7 @@ G?nderildi?i Tarih: {{ object.submit|date:"d F Y" }}
    ?ndirilme Say?s?: {{ object.download_count }}
    Kategori: {{object.category.name}}
    - {% if object.origin_url %}?zg?n ?al??ma
    {% endif %}
    + {% if object.origin_url %}Web Sitesi
    {% endif %}

    {{ object.text }} From oi-svn at pardus.org.tr Thu Dec 23 18:55:48 2010 From: oi-svn at pardus.org.tr (=?utf-8?q?=C4=B0lker_Kesen?=) Date: Thu, 23 Dec 2010 18:55:48 +0200 (EET) Subject: [Oi-commits] trunk/tema - show version on the list Message-ID: <20101223165548.D99E549CC06@ns1.pardus.org.tr> Author: ilker Date: Thu Dec 23 18:55:47 2010 New Revision: 3657 Modified: trunk/tema/admin.py Log: show version on the list --- admin.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: trunk/tema/admin.py ================================================================= --- trunk/tema/admin.py (original) +++ trunk/tema/admin.py Thu Dec 23 18:55:47 2010 @@ -71,7 +71,7 @@ ) class IconSetAdmin(ThemeItemAdmin): - list_display = ("title", "author", "license", "status") + list_display = ("title", "version", "author", "license", "status") fieldsets = ( (None, { "fields": ("thumbnail", "title", "slug", "version", @@ -85,7 +85,7 @@ ) class OpenOfficeThemeAdmin(ThemeItemAdmin): - list_display = ("title", "author", "license", "status") + list_display = ("title", "version", "author", "license", "status") fieldsets = ( (None, { "fields": ("thumbnail", "title", "slug", "version", From oi-svn at pardus.org.tr Fri Dec 24 01:54:12 2010 From: oi-svn at pardus.org.tr (=?utf-8?b?R8O2a21lbiBHw7ZyZ2Vu?=) Date: Fri, 24 Dec 2010 01:54:12 +0200 (EET) Subject: [Oi-commits] trunk - fixed small cosmic errors. Message-ID: <20101223235412.F202749CB55@ns1.pardus.org.tr> Author: gkmngrgn Date: Fri Dec 24 01:54:12 2010 New Revision: 3658 Modified: trunk/media/img/tema/new/TipoAltGri.png trunk/media/img/tema/new/TipoAltMai.png trunk/media/img/tema/new/TipoUstGri.png trunk/media/img/tema/new/TipoUstMai.png trunk/media/img/tema/new/duvarAltGri.png trunk/media/img/tema/new/duvarAltMai.png trunk/media/img/tema/new/duvarUstGri.png trunk/media/img/tema/new/duvarUstMai.png trunk/media/img/tema/new/sablonAltMai.png trunk/media/img/tema/new/sablonAltgri.png trunk/media/img/tema/new/sablonUstGri.png trunk/media/img/tema/new/sablonUstMai.png trunk/media/img/tema/new/simgeAltGri.png trunk/media/img/tema/new/simgeAltMai.png trunk/media/img/tema/new/simgeUstGri.png trunk/media/img/tema/new/simgeUstMai.png trunk/media/img/tema/new/uygulamaGri.png trunk/media/img/tema/new/uygulamaMai.png trunk/templates/tema/themeitem_welcome.html Log: fixed small cosmic errors. --- themeitem_welcome.html | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) Modified: trunk/media/img/tema/new/TipoAltGri.png ================================================================= Binary files. No diff available. Modified: trunk/media/img/tema/new/TipoAltMai.png ================================================================= Binary files. No diff available. Modified: trunk/media/img/tema/new/TipoUstGri.png ================================================================= Binary files. No diff available. Modified: trunk/media/img/tema/new/TipoUstMai.png ================================================================= Binary files. No diff available. Modified: trunk/media/img/tema/new/duvarAltGri.png ================================================================= Binary files. No diff available. Modified: trunk/media/img/tema/new/duvarAltMai.png ================================================================= Binary files. No diff available. Modified: trunk/media/img/tema/new/duvarUstGri.png ================================================================= Binary files. No diff available. Modified: trunk/media/img/tema/new/duvarUstMai.png ================================================================= Binary files. No diff available. Modified: trunk/media/img/tema/new/sablonAltMai.png ================================================================= Binary files. No diff available. Modified: trunk/media/img/tema/new/sablonAltgri.png ================================================================= Binary files. No diff available. Modified: trunk/media/img/tema/new/sablonUstGri.png ================================================================= Binary files. No diff available. Modified: trunk/media/img/tema/new/sablonUstMai.png ================================================================= Binary files. No diff available. Modified: trunk/media/img/tema/new/simgeAltGri.png ================================================================= Binary files. No diff available. Modified: trunk/media/img/tema/new/simgeAltMai.png ================================================================= Binary files. No diff available. Modified: trunk/media/img/tema/new/simgeUstGri.png ================================================================= Binary files. No diff available. Modified: trunk/media/img/tema/new/simgeUstMai.png ================================================================= Binary files. No diff available. Modified: trunk/media/img/tema/new/uygulamaGri.png ================================================================= Binary files. No diff available. Modified: trunk/media/img/tema/new/uygulamaMai.png ================================================================= Binary files. No diff available. Modified: trunk/templates/tema/themeitem_welcome.html ================================================================= --- trunk/templates/tema/themeitem_welcome.html (original) +++ trunk/templates/tema/themeitem_welcome.html Fri Dec 24 01:54:12 2010 @@ -8,7 +8,7 @@ {% block title %}Temalar - {% if author %}{{ author }} taraf?ndan g?nderilen i?erik - {% endif %}{% endblock %} {% block content %} @@ -55,13 +55,13 @@
    - +
    -
    - +
    +
    @@ -84,9 +84,9 @@
    - +
    -     +
    @@ -99,7 +99,7 @@
    -
    +
    @@ -113,7 +113,7 @@
    -
    +
    From oi-svn at pardus.org.tr Fri Dec 24 17:27:03 2010 From: oi-svn at pardus.org.tr (=?utf-8?q?=C4=B0lker_Kesen?=) Date: Fri, 24 Dec 2010 17:27:03 +0200 (EET) Subject: [Oi-commits] trunk/grappelli/templates/admin - little fix, thanks to irfan Message-ID: <20101224152703.8364849CB5B@ns1.pardus.org.tr> Author: ilker Date: Fri Dec 24 17:27:01 2010 New Revision: 3659 Modified: trunk/grappelli/templates/admin/change_form.html Log: little fix, thanks to irfan --- change_form.html | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) Modified: trunk/grappelli/templates/admin/change_form.html ================================================================= --- trunk/grappelli/templates/admin/change_form.html (original) +++ trunk/grappelli/templates/admin/change_form.html Fri Dec 24 17:27:01 2010 @@ -14,11 +14,9 @@ {% endblock %} From oi-svn at pardus.org.tr Fri Dec 24 17:52:07 2010 From: oi-svn at pardus.org.tr (=?utf-8?q?=C4=B0lker_Kesen?=) Date: Fri, 24 Dec 2010 17:52:07 +0200 (EET) Subject: [Oi-commits] trunk/grappelli/media/css - revert it, i have just found better solution Message-ID: <20101224155207.EAFE849CB5B@ns1.pardus.org.tr> Author: ilker Date: Fri Dec 24 17:52:05 2010 New Revision: 3660 Modified: trunk/grappelli/media/css/forms.css Log: revert it, i have just found better solution --- forms.css | 4 ---- 1 file changed, 4 deletions(-) Modified: trunk/grappelli/media/css/forms.css ================================================================= --- trunk/grappelli/media/css/forms.css (original) +++ trunk/grappelli/media/css/forms.css Fri Dec 24 17:52:05 2010 @@ -28,10 +28,6 @@ margin-top: -3px; } -.image_filter { - margin-left:10px; -} - /* Errors ------------------------------------------------------------------------------------------------------ */ From oi-svn at pardus.org.tr Fri Dec 24 17:52:59 2010 From: oi-svn at pardus.org.tr (=?utf-8?q?=C4=B0lker_Kesen?=) Date: Fri, 24 Dec 2010 17:52:59 +0200 (EET) Subject: [Oi-commits] trunk/media/js - fix for #83 Message-ID: <20101224155259.23DAC49CB5B@ns1.pardus.org.tr> Author: ilker Date: Fri Dec 24 17:52:59 2010 New Revision: 3661 Modified: trunk/media/js/adminimages.js Log: fix for #83 --- adminimages.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: trunk/media/js/adminimages.js ================================================================= --- trunk/media/js/adminimages.js (original) +++ trunk/media/js/adminimages.js Fri Dec 24 17:52:59 2010 @@ -5,7 +5,7 @@ var image = $("#id_image"); image.attr("onchange", "update_image(this)"); image.attr("onkeyup", "update_image(this)"); - $(".image").before("

    Buray? kullanarak g?rsellerde arama yapabilirsiniz.

    "); + $(".image").before("

    Buray? kullanarak g?rsellerde arama yapabilirsiniz.

    "); $(".image > div").after("\"?stteki"); $("#filter").attr("onchange", "filter_images()"); $("#filter").attr("onkeyup", "filter_images()"); From oi-svn at pardus.org.tr Fri Dec 24 18:07:03 2010 From: oi-svn at pardus.org.tr (=?utf-8?q?=C4=B0lker_Kesen?=) Date: Fri, 24 Dec 2010 18:07:03 +0200 (EET) Subject: [Oi-commits] trunk/media/js - missing ; added Message-ID: <20101224160703.9BC9249CB5B@ns1.pardus.org.tr> Author: ilker Date: Fri Dec 24 18:07:02 2010 New Revision: 3662 Modified: trunk/media/js/adminimages.js Log: missing ; added --- adminimages.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: trunk/media/js/adminimages.js ================================================================= --- trunk/media/js/adminimages.js (original) +++ trunk/media/js/adminimages.js Fri Dec 24 18:07:02 2010 @@ -14,7 +14,7 @@ function filter_images() { if ($("#filter").val().length > 2) { $("#id_image > option").hide(); - var results = $("#id_image > option:contains('" + $("#filter").val() + "')") + var results = $("#id_image > option:contains('" + $("#filter").val() + "')"); results.show(); if (results.length == 0) { $("#filter").css("color", "red"); From oi-svn at pardus.org.tr Fri Dec 24 19:43:58 2010 From: oi-svn at pardus.org.tr (=?utf-8?q?=C4=B0lker_Kesen?=) Date: Fri, 24 Dec 2010 19:43:58 +0200 (EET) Subject: [Oi-commits] trunk/templates/admin/seminar - remove old templates Message-ID: <20101224174358.4986749C90E@ns1.pardus.org.tr> Author: ilker Date: Fri Dec 24 19:43:57 2010 New Revision: 3663 Removed: trunk/templates/admin/seminar/ Log: remove old templates From oi-svn at pardus.org.tr Fri Dec 24 19:44:37 2010 From: oi-svn at pardus.org.tr (=?utf-8?q?=C4=B0lker_Kesen?=) Date: Fri, 24 Dec 2010 19:44:37 +0200 (EET) Subject: [Oi-commits] trunk/grappelli/templates/admin - fix for #62 Message-ID: <20101224174437.4E31C49C90E@ns1.pardus.org.tr> Author: ilker Date: Fri Dec 24 19:44:36 2010 New Revision: 3664 Added: trunk/grappelli/templates/admin/seminar/ trunk/grappelli/templates/admin/seminar/place/ trunk/grappelli/templates/admin/seminar/place/change_form.html Modified: trunk/grappelli/templates/admin/_grappelli/base.html Log: fix for #62 --- _grappelli/base.html | 2 seminar/place/change_form.html | 147 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 148 insertions(+), 1 deletion(-) Modified: trunk/grappelli/templates/admin/_grappelli/base.html ================================================================= --- trunk/grappelli/templates/admin/_grappelli/base.html (original) +++ trunk/grappelli/templates/admin/_grappelli/base.html Fri Dec 24 19:44:36 2010 @@ -49,7 +49,7 @@ {% block extrahead %}{% endblock %} {% endspaceless %} - +
    From oi-svn at pardus.org.tr Sat Dec 25 13:47:14 2010 From: oi-svn at pardus.org.tr (=?utf-8?q?=C4=B0lker_Kesen?=) Date: Sat, 25 Dec 2010 13:47:14 +0200 (EET) Subject: [Oi-commits] trunk/tema - update item if item is changed Message-ID: <20101225114714.767A949CB1F@ns1.pardus.org.tr> Author: ilker Date: Sat Dec 25 13:47:13 2010 New Revision: 3665 Modified: trunk/tema/views.py Log: update item if item is changed --- views.py | 1 + 1 file changed, 1 insertion(+) Modified: trunk/tema/views.py ================================================================= --- trunk/tema/views.py (original) +++ trunk/tema/views.py Sat Dec 25 13:47:13 2010 @@ -498,6 +498,7 @@ object.version = form.cleaned_data.get("version") object.changelog = form.cleaned_data["changelog"] object.comment_enabled = form.cleaned_data["comment_enabled"] + object.update = datetime.datetime.now() object.save() return HttpResponseRedirect(object.get_absolute_url()) From oi-svn at pardus.org.tr Sat Dec 25 15:40:07 2010 From: oi-svn at pardus.org.tr (=?utf-8?q?=C4=B0lker_Kesen?=) Date: Sat, 25 Dec 2010 15:40:07 +0200 (EET) Subject: [Oi-commits] trunk/media/img/tema/new - fresh/updated is coming Message-ID: <20101225134007.739E549D598@ns1.pardus.org.tr> Author: ilker Date: Sat Dec 25 15:40:07 2010 New Revision: 3666 Added: trunk/media/img/tema/new/fresh.png (contents, props changed) trunk/media/img/tema/new/updated.png (contents, props changed) Log: fresh/updated is coming From oi-svn at pardus.org.tr Sat Dec 25 15:47:14 2010 From: oi-svn at pardus.org.tr (=?utf-8?q?=C4=B0lker_Kesen?=) Date: Sat, 25 Dec 2010 15:47:14 +0200 (EET) Subject: [Oi-commits] trunk/templates/admin - not neccesary Message-ID: <20101225134714.D482B49D598@ns1.pardus.org.tr> Author: ilker Date: Sat Dec 25 15:47:14 2010 New Revision: 3667 Removed: trunk/templates/admin/ Log: not neccesary From oi-svn at pardus.org.tr Sat Dec 25 15:47:50 2010 From: oi-svn at pardus.org.tr (=?utf-8?q?=C4=B0lker_Kesen?=) Date: Sat, 25 Dec 2010 15:47:50 +0200 (EET) Subject: [Oi-commits] trunk/tema/templatetags - fresh_or_updated function added Message-ID: <20101225134750.ADCAC49D598@ns1.pardus.org.tr> Author: ilker Date: Sat Dec 25 15:47:50 2010 New Revision: 3668 Modified: trunk/tema/templatetags/tema.py Log: fresh_or_updated function added --- tema.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) Modified: trunk/tema/templatetags/tema.py ================================================================= --- trunk/tema/templatetags/tema.py (original) +++ trunk/tema/templatetags/tema.py Sat Dec 25 15:47:50 2010 @@ -8,9 +8,22 @@ from django import template from django.template import Context, loader from oi.tema.models import ThemeAbuseReport +import datetime register = template.Library() @register.simple_tag def number_of_theme_abuse(): return ThemeAbuseReport.objects.count() + + at register.simple_tag +def fresh_or_updated(item): + delta = datetime.datetime.now() - item.update + if delta.days < 11: + if item.submit == item.update: + result = "fresh" + else: + result = "updated" + + return "" % result + return "" From oi-svn at pardus.org.tr Sat Dec 25 15:48:20 2010 From: oi-svn at pardus.org.tr (=?utf-8?q?=C4=B0lker_Kesen?=) Date: Sat, 25 Dec 2010 15:48:20 +0200 (EET) Subject: [Oi-commits] trunk/templates/tema - fresh_or_updated works\ Message-ID: <20101225134820.3533549D598@ns1.pardus.org.tr> Author: ilker Date: Sat Dec 25 15:48:20 2010 New Revision: 3669 Modified: trunk/templates/tema/themeitem_list.html Log: fresh_or_updated works\! --- themeitem_list.html | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) Modified: trunk/templates/tema/themeitem_list.html ================================================================= --- trunk/templates/tema/themeitem_list.html (original) +++ trunk/templates/tema/themeitem_list.html Sat Dec 25 15:48:20 2010 @@ -1,5 +1,6 @@ {% extends "tema/base.html" %} {% load library %} +{% load tema %} {% block temaextrahead %} @@ -30,7 +31,9 @@ g?lge
    {{ object.update|date:"d" }} {{ object.update|date:"F"|slice:":3" }} {{ object.update|date:"Y" }} / {{ object.topic.posts|add:"-1" }} Yorum
    -
    {{ object.title }}
    +
    {{ object.title }} + {% fresh_or_updated object %} +
    {{ object.text|safe|truncatewords_html:23 }}
    {% endfor %} From oi-svn at pardus.org.tr Sat Dec 25 16:58:40 2010 From: oi-svn at pardus.org.tr (=?utf-8?q?=C4=B0lker_Kesen?=) Date: Sat, 25 Dec 2010 16:58:40 +0200 (EET) Subject: [Oi-commits] trunk/tema/templatetags - tag for recently updated themes Message-ID: <20101225145840.95B2449D59A@ns1.pardus.org.tr> Author: ilker Date: Sat Dec 25 16:58:40 2010 New Revision: 3670 Modified: trunk/tema/templatetags/tema.py Log: tag for recently updated themes --- tema.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) Modified: trunk/tema/templatetags/tema.py ================================================================= --- trunk/tema/templatetags/tema.py (original) +++ trunk/tema/templatetags/tema.py Sat Dec 25 16:58:40 2010 @@ -7,7 +7,7 @@ from django import template from django.template import Context, loader -from oi.tema.models import ThemeAbuseReport +from oi.tema.models import ThemeAbuseReport, ThemeItem import datetime register = template.Library() @@ -17,6 +17,11 @@ return ThemeAbuseReport.objects.count() @register.simple_tag +def recently_updated(): + items = ThemeItem.objects.filter(status=True).order_by("-update")[:10] + return loader.get_template("tema/sidebar.html").render(Context({"items": items})) + + at register.simple_tag def fresh_or_updated(item): delta = datetime.datetime.now() - item.update if delta.days < 11: From oi-svn at pardus.org.tr Sat Dec 25 16:59:03 2010 From: oi-svn at pardus.org.tr (=?utf-8?q?=C4=B0lker_Kesen?=) Date: Sat, 25 Dec 2010 16:59:03 +0200 (EET) Subject: [Oi-commits] trunk/templates/tema - show recently updates Message-ID: <20101225145904.0243B49D59A@ns1.pardus.org.tr> Author: ilker Date: Sat Dec 25 16:59:03 2010 New Revision: 3671 Added: trunk/templates/tema/sidebar.html - copied, changed from r3612, trunk/templates/tema/sidebar.html Modified: trunk/templates/tema/base.html Log: show recently updates --- base.html | 2 ++ sidebar.html | 8 ++++++++ 2 files changed, 10 insertions(+) Modified: trunk/templates/tema/base.html ================================================================= --- trunk/templates/tema/base.html (original) +++ trunk/templates/tema/base.html Sat Dec 25 16:59:03 2010 @@ -34,6 +34,8 @@ {% endif %} + {% recently_updated %} +
    {% endblock %} Copied: trunk/templates/tema/sidebar.html (from r3612, trunk/templates/tema/sidebar.html) ================================================================= --- trunk/templates/tema/sidebar.html (original) +++ trunk/templates/tema/sidebar.html Sat Dec 25 16:59:03 2010 @@ -1,8 +1,8 @@
    -

    {{ title }}

    +

    En G?ncel ??erikler

    From oi-svn at pardus.org.tr Sat Dec 25 17:39:49 2010 From: oi-svn at pardus.org.tr (=?utf-8?q?=C4=B0lker_Kesen?=) Date: Sat, 25 Dec 2010 17:39:49 +0200 (EET) Subject: [Oi-commits] trunk/templates/tema - display recently updated themes at only welcome pa... Message-ID: <20101225153949.CD9A149D59A@ns1.pardus.org.tr> Author: ilker Date: Sat Dec 25 17:39:47 2010 New Revision: 3672 Modified: trunk/templates/tema/base.html Log: display recently updated themes at only welcome page --- base.html | 2 ++ 1 file changed, 2 insertions(+) Modified: trunk/templates/tema/base.html ================================================================= --- trunk/templates/tema/base.html (original) +++ trunk/templates/tema/base.html Sat Dec 25 17:39:47 2010 @@ -34,7 +34,9 @@ {% endif %} + {% if not category %} {% recently_updated %} + {% endif %}
    From oi-svn at pardus.org.tr Mon Dec 27 18:00:06 2010 From: oi-svn at pardus.org.tr (=?utf-8?q?=C4=B0lker_Kesen?=) Date: Mon, 27 Dec 2010 18:00:06 +0200 (EET) Subject: [Oi-commits] trunk/tema - solution for #87 Message-ID: <20101227160006.B7F9C49CC70@ns1.pardus.org.tr> Author: ilker Date: Mon Dec 27 18:00:06 2010 New Revision: 3673 Modified: trunk/tema/views.py Log: solution for #87 --- views.py | 4 ++++ 1 file changed, 4 insertions(+) Modified: trunk/tema/views.py ================================================================= --- trunk/tema/views.py (original) +++ trunk/tema/views.py Mon Dec 27 18:00:06 2010 @@ -567,6 +567,10 @@ object = get_object_or_404(PackageScreenshot, id=id) object.download_count += 1 object.save() + elif category == "simge-seti": + object = get_object_or_404(IconSet, id=id) + object.download_count += 1 + object.save() else: raise Http404 return HttpResponseRedirect(object.get_download_url()) From oi-svn at pardus.org.tr Mon Dec 27 18:51:29 2010 From: oi-svn at pardus.org.tr (=?utf-8?q?=C4=B0lker_Kesen?=) Date: Mon, 27 Dec 2010 18:51:29 +0200 (EET) Subject: [Oi-commits] trunk/media/img/tema/new - new images for fresh&updated feature Message-ID: <20101227165129.A044B49CBE8@ns1.pardus.org.tr> Author: ilker Date: Mon Dec 27 18:51:29 2010 New Revision: 3674 Modified: trunk/media/img/tema/new/fresh.png trunk/media/img/tema/new/updated.png Log: new images for fresh&updated feature Modified: trunk/media/img/tema/new/fresh.png ================================================================= Binary files. No diff available. Modified: trunk/media/img/tema/new/updated.png ================================================================= Binary files. No diff available. From oi-svn at pardus.org.tr Tue Dec 28 19:03:19 2010 From: oi-svn at pardus.org.tr (=?utf-8?q?=C4=B0lker_Kesen?=) Date: Tue, 28 Dec 2010 19:03:19 +0200 (EET) Subject: [Oi-commits] trunk/media/js - use === to compare with 0 Message-ID: <20101228170319.7DF6C49CB17@ns1.pardus.org.tr> Author: ilker Date: Tue Dec 28 19:03:19 2010 New Revision: 3675 Modified: trunk/media/js/adminimages.js Log: use === to compare with 0 --- adminimages.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: trunk/media/js/adminimages.js ================================================================= --- trunk/media/js/adminimages.js (original) +++ trunk/media/js/adminimages.js Tue Dec 28 19:03:19 2010 @@ -16,7 +16,7 @@ $("#id_image > option").hide(); var results = $("#id_image > option:contains('" + $("#filter").val() + "')"); results.show(); - if (results.length == 0) { + if (results.length === 0) { $("#filter").css("color", "red"); } else { $("#filter").css("color", ""); From oi-svn at pardus.org.tr Thu Dec 30 18:03:08 2010 From: oi-svn at pardus.org.tr (=?utf-8?q?=C4=B0lker_Kesen?=) Date: Thu, 30 Dec 2010 18:03:08 +0200 (EET) Subject: [Oi-commits] trunk/grappelli/templates/admin/seminar/place - fix little bug Message-ID: <20101230160308.EADBD49CB17@ns1.pardus.org.tr> Author: ilker Date: Thu Dec 30 18:03:08 2010 New Revision: 3676 Modified: trunk/grappelli/templates/admin/seminar/place/change_form.html Log: fix little bug --- change_form.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: trunk/grappelli/templates/admin/seminar/place/change_form.html ================================================================= --- trunk/grappelli/templates/admin/seminar/place/change_form.html (original) +++ trunk/grappelli/templates/admin/seminar/place/change_form.html Thu Dec 30 18:03:08 2010 @@ -53,7 +53,7 @@ {% endblock %} -{% block extrabody %} onload="load()" onunload="GUnload(){% endblock %} +{% block extrabody %} onload="load()" onunload="GUnload()"{% endblock %} {% block stylesheet %}{% admin_media_prefix %}css/forms.css{% endblock %}