diff --git a/DJAGEN/branches/mustafa_branch/djagen/collector/forms.py b/DJAGEN/branches/mustafa_branch/djagen/collector/forms.py index c33ce8d..2b914ae 100755 --- a/DJAGEN/branches/mustafa_branch/djagen/collector/forms.py +++ b/DJAGEN/branches/mustafa_branch/djagen/collector/forms.py @@ -19,3 +19,6 @@ class QueryForm(forms.Form): q_author_name = forms.CharField(max_length=25, required = False, label = 'Adı') q_author_surname = forms.CharField(max_length=25, required = False, label = 'Soyadı') q_text = forms.CharField(required = False, label = 'Aradığınız metin', widget = forms.widgets.Textarea() ) + q_date_year = forms.DateField(input_formats = '%y',required = False, label = 'Blog girdisine ait yıl(Örn:2010)', widget=forms.widgets.DateTimeInput()) + q_date_month = forms.DateField(input_formats = '%m',required = False, label = 'Blog girdisine ait ay(Örn:03)', widget=forms.widgets.DateTimeInput()) + q_date_day = forms.DateField(input_formats = '%d',required = False, label = 'Blog girdisine ait gün (Örn:27)', widget=forms.widgets.DateTimeInput()) diff --git a/DJAGEN/branches/mustafa_branch/djagen/collector/views.py b/DJAGEN/branches/mustafa_branch/djagen/collector/views.py index 91f0972..b08b5af 100755 --- a/DJAGEN/branches/mustafa_branch/djagen/collector/views.py +++ b/DJAGEN/branches/mustafa_branch/djagen/collector/views.py @@ -35,7 +35,7 @@ def main(request): last_entry_date = Entries.objects.all()[0].date day = datetime.timedelta(days=1) last_date_li = [] - for x in xrange(6): + for x in xrange(5): last_entry_date -= day last_date_li.append(last_entry_date) @@ -114,18 +114,50 @@ def list_members(request): authors = Authors.objects.all() return render_response(request, 'main/members.html', {'members': authors, 'BASE_URL': BASE_URL,'info_area' : info_area }) - +#############################Under Construction###################### def query(request): + return (HttpResponse("query page")) +# if(request.method == 'GET'): +# form = QueryForm(request.GET) +# if form.is_valid(): +# if(('q_author_name' in request.GET) or +# ('q_author_surname' in request.GET) or +# ('q_text' in request.GET) or +# ('q_date_year' in request.GET) or +# ('q_date_month' in request.GET) or +# ('q_date_day' in request.GET)): +# redirect_url = BASE_URL + "/archive" +# if ('q_date_year' in request.GET and request.GET['q_date_year']): +# redirect_url += "/" + request.GET['q_date_year'] +# if ('q_date_month' in request.GET and request.GET['q_date_month']): +# redirect_url += "/" + request.GET['q_date_month'] +# if('q_date_day' in request.GET and request.GET['q_date_day']): +# redirect_url += "/"+str(request.GET['q_date_day']) +# return HttpResponseRedirect(redirect_url) +# else: +# q_form = QueryForm() +# return render_response(request,'main/query.html',{ +# 'BASE_URL' : BASE_URL, +# 'q_form':q_form, +# }) +# else: +# q_form = QueryForm() +# return render_response(request,'main/query.html',{ +# 'BASE_URL' : BASE_URL, +# 'q_form':q_form, +# }) +# +# +# else: +# +# q_form = QueryForm() +# return render_response(request,'main/query.html',{ +# 'BASE_URL' : BASE_URL, +# 'q_form':q_form, +# }) - q_form = QueryForm() - - return render_response(request,'main/query.html',{ - 'BASE_URL' : BASE_URL, - 'q_form':q_form, - }) - -def archive(request,archive_year='',archive_month='',archive_day=''): - +def archive(request,archive_year=None,archive_month=None,archive_day=None): + info_area = 'query' # This setting gets the content truncated which contains more than words. truncate_words = 250 items_per_page = 25 @@ -133,140 +165,95 @@ def archive(request,archive_year='',archive_month='',archive_day=''): #get the last run time run_time = RunTime.objects.all()[0] - - ### Determine if the request object includes any querying input or not. ### - - if ( (request.GET) and ('q_author_name' in request.GET or 'q_author_surname' in request.GET or 'q_text' in request.GET ) ): - # Switch to 'return the result of query' mode. - info_area = 'query' - - #Querying - #TODO: We should improve querying method implemented here. - q_author_name,q_author_surname,q_text = '','','' - authors = Authors.objects.all() - if ( ('q_author_name' in request.GET) and (request.GET['q_author_name'] )): - q_author_name = request.GET['q_author_name'] - authors = authors.filter(author_name__iexact = q_author_name) - - - if (('q_author_surname' in request.GET) and (request.GET['q_author_surname'])): - q_author_surname = request.GET['q_author_surname'] - authors = authors.filter(author_surname__iexact = q_author_surname) - - - for item in authors: - - try: - entries_list |= item.entries_set.all() - except: - entries_list = item.entries_set.all() - - if( ('q_text' in request.GET)and(request.GET['q_text'])): - q_text = request.GET['q_text'] - if (q_author_name or q_author_surname): - - entries_list = entries_list.filter(content_text__icontains = q_text) - else: - entries_list = Entries.objects.filter(content_text__icontains = q_text) - - - - try: - if(not(entries_list)): - return HttpResponseRedirect(BASE_URL+"/query") - except: - return HttpResponseRedirect(BASE_URL+ "/query") - - #here is gonna be edited [X] - # Pagination - - elements_in_a_page = 25 # This determines, how many elements will be displayed in a paginator page. - paginator = Paginator(entries_list,elements_in_a_page) - # Validation for page number if it is not int return first page. - try: - page = int(request.GET.get('page', '1')) - except ValueError: - page = 1 - - # If page request is out of range, return last page . - try: - p_entries_list = paginator.page(page) - except (EmptyPage, InvalidPage): - p_entries_list = paginator.page(paginator.num_pages) - - return render_to_response('main/archive.html' ,{ - 'entries_list':entries_list, - 'p_entries_list':p_entries_list, - 'truncate_words':truncate_words, - 'items_per_page':repr(items_per_page), - 'run_time':run_time, - 'info_area':info_area, - 'q_author_name':q_author_name, - 'q_author_surname':q_author_surname, - 'q_text':q_text, - 'BASE_URL':BASE_URL, - }) - ### If not ### + # Now we are creating few scenarios depending on the incoming variables. + # This part is for validation. + if ('q_author_name' in request.GET and request.GET['q_author_name']): #If that exists and not empty + q_author_name = request.GET['q_author_name'] else: - #Switch to return the result of arguments provided mode(archive viewing mode). - info_area = 'archive' # \This variable is used for determining which infoarea text should be used in "contenttop" div in /main/base.html + q_author_name = None + if ('q_author_surname' in request.GET and request.GET['q_author_surname']): #If that exists and not empty + q_author_surname = request.GET['q_author_surname'] + else: + q_author_surname = None + if ('q_text' in request.GET and request.GET['q_text']): #If that exists and not empty + q_text = request.GET['q_text'] + else: + q_text = None + if ('q_label_personal' in request.GET and request.GET['q_label_personal'] == '1'): #If that exists and not empty + q_label_personal = request.GET['q_label_personal'] + else: + q_label_personal = None + if ('q_label_community' in request.GET and request.GET['q_label_community'] == '1'): + q_label_community = request.GET['q_label_community'] + else: + q_label_community = None - selected_entries = Entries.objects.select_related() + if ('q_label_lkd' in request.GET and request.GET['q_label_lkd']=='1'): + q_label_lkd = request.GET['q_label_lkd'] + else: + q_label_lkd = None + #-- +#-- - # For entry categories - entries_list1 = selected_entries.filter(entry_id__label_personal = 1) - entries_list2 = selected_entries.filter(entry_id__label_lkd = 1) - entries_list3 = selected_entries.filter(entry_id__label_community = 1) - entries_list = entries_list1 | entries_list2 | entries_list3 +# Querying + entries_list = Entries.objects.select_related() + # Name - surname queries. - ## Validating arguments provided by urls.py. - # Check if archive_year is not empty and numeric. - if((archive_year != '' ) and (str(archive_year).isalnum()) and (not(str(archive_year).isalpha()))): - entries_list = entries_list.filter(date__year=archive_year) - else: - # Fall back to main view. - return HttpResponseRedirect(BASE_URL+"/main") - #pass - - # Check if archive_month is not empty and numeric. - if(archive_month != ''and (str(archive_month).isalnum()) and not(str(archive_month).isalpha())): - entries_list = entries_list.filter(date__month=archive_month) - - # Check if archive_day is not empty and numeric. - if(archive_day != ''and (str(archive_day).isalnum()) and not(str(archive_day).isalpha())): - entries_list = entries_list.filter(date__day=archive_day) - ## + if(q_author_name): + entries_list = entries_list.filter(entry_id__author_name__iexact = q_author_name) + if(q_author_surname): + entries_list = entries_list.filter(entry_id__author_surname__iexact = q_author_surname) + elif(q_author_surname): + entries_list = entries_list.filter(entry_id__author_surname__iexact = q_author_surname) - # Pagination - elements_in_a_page = 25 # This determines, how many elements will be displayed in a paginator page. - paginator = Paginator(entries_list,elements_in_a_page) - - # Validation for page number if it is not int return first page. - try: - page = int(request.GET.get('page', '1')) - except ValueError: - page = 1 - - # If page request is out of range, return last page . - try: - p_entries_list = paginator.page(page) - except (EmptyPage, InvalidPage): - p_entries_list = paginator.page(paginator.num_pages) + if(q_label_personal): + entries_list = entries_list.filter(entry_id__label_personal = 1) + if(q_label_community): + entries_list = entries_list.filter(entry_id__label_community = 1) + if(q_label_lkd): + entries_list = entries_list.filter(entry_id__label_lkd = 1) + if(q_text): + entries_list = entries.list.filter(content_text__icontains = q_text) + + if(archive_year): + entries_list = entries_list.filter(date__year = archive_year) + if(archive_month): + entries_list = entries_list.filter(date__month = archive_month) + if(archive_day): + entries_list = entries_list.filter(date__day = archive_day) + +#-- + + # Pagination + elements_in_a_page = 25 # This determines, how many elements will be displayed in a paginator page. + paginator = Paginator(entries_list,elements_in_a_page) + # Validation for page number if it is not int return first page. + try: + page = int(request.GET.get('page', '1')) + except ValueError: + page = 1 + + # If page request is out of range, return last page . + try: + p_entries_list = paginator.page(page) + except (EmptyPage, InvalidPage): + p_entries_list = paginator.page(paginator.num_pages) + #-- + + return render_to_response('main/archive.html' ,{ + 'entries_list':entries_list, + 'p_entries_list':p_entries_list, + 'truncate_words':truncate_words, + 'items_per_page':repr(items_per_page), + 'run_time':run_time, + 'info_area':info_area, + 'q_author_name':q_author_name, + 'q_author_surname':q_author_surname, + 'q_text':q_text, + 'BASE_URL':BASE_URL, + }) - return render_to_response('main/archive.html' ,{ - 'entries_list':entries_list, - 'p_entries_list':p_entries_list, - 'truncate_words':truncate_words, - 'items_per_page':repr(items_per_page), - 'run_time':run_time, - 'archive_year':archive_year, - 'archive_month':archive_month, - 'archive_day':archive_day, - #'error':error, - 'BASE_URL':BASE_URL, - 'info_area':info_area, - }) diff --git a/DJAGEN/branches/mustafa_branch/djagen/gezegen/planet.py b/DJAGEN/branches/mustafa_branch/djagen/gezegen/planet.py index 017b137..3d46ca1 100755 --- a/DJAGEN/branches/mustafa_branch/djagen/gezegen/planet.py +++ b/DJAGEN/branches/mustafa_branch/djagen/gezegen/planet.py @@ -44,8 +44,7 @@ TEMPLATE_FILES = "examples/basic/planet.html.tmpl" import sys import os # In order to reduce integration issues, this path gets defined automatically. -sys.path.append(os.path.abspath('../..')) - +sys.path.append("/home/cad/Workspace/djagen_ws/gezegen/DJAGEN/branches/mustafa_branch/") os.environ['DJANGO_SETTINGS_MODULE'] = 'djagen.settings' from djagen.collector.models import * @@ -185,13 +184,12 @@ def main(): for word in words: tmp_first_name += ' ' + word author_name = tmp_first_name[1:] ### ### - print channel.name + #print channel.name #author_name = channel.name #author_surname = channel.surname try: author_face = channel.face - print channel.face except: author_face = None try: @@ -214,7 +212,6 @@ def main(): channel_urlstatus = channel.url_status except: channel_urlstatus = None - print channel.label label = channel.label label_personal = 0 @@ -229,7 +226,6 @@ def main(): label_community = 1 if label == "Eng": label_eng = 1 - print channel.id id = channel.id try: @@ -251,7 +247,7 @@ def main(): author.label_eng = label_eng except Exception, ex: - print ex + #print ex author = Authors(author_id=id, author_name=author_name, author_surname=author_surname, author_face=author_face, channel_subtitle=channel_subtitle, channel_title=channel_title, channel_url=channel_url, channel_link=channel_link, channel_urlstatus=channel_urlstatus, label_personal=label_personal, label_lkd=label_lkd, label_community=label_community, label_eng=label_eng) diff --git a/DJAGEN/branches/mustafa_branch/djagen/gezegen/www/layout.css b/DJAGEN/branches/mustafa_branch/djagen/gezegen/www/layout.css index bdb3687..16c6b88 100755 --- a/DJAGEN/branches/mustafa_branch/djagen/gezegen/www/layout.css +++ b/DJAGEN/branches/mustafa_branch/djagen/gezegen/www/layout.css @@ -1,287 +1,286 @@ -@charset "utf-8"; -/* CSS Document */ - -html, body, div, span, applet, object, iframe, -h1, h2, h3, h4, h5, h6, p, blockquote, pre, -a, abbr, acronym, address, big, cite, code, -del, dfn, em, font, img, ins, kbd, q, s, samp, -small, strike, strong, sub, sup, tt, var, -b, u, i, center, -dl, dt, dd, ol, ul, li, -fieldset, form, label, legend, -table, caption, tbody, tfoot, thead, tr, th, td, -header, nav, section, article, aside, footer -{border: 0; margin: 0; outline: 0; padding: 0; background: transparent; vertical-align: baseline;} - -blockquote, q {quotes: none;} -blockquote:before,blockquote:after,q:before,q:after {content: ''; content: none;} - -header, nav, section, article, aside, footer {display: block;} - -/* Basic styles */ -body {background: #fff; color: #000; font: .75em/1.5em Helvetica, Arial, "Liberation Sans", "Bitstream Vera Sans", sans-serif;} -html>body {font-size: 12px;} - -img {display: inline-block; vertical-align: bottom;} - -h1,h2,h3,h4,h5,h6,strong,b,dt,th {font-weight: 700;} -address,cite,em,i,caption,dfn,var {font-style: italic;} - -h1 {margin: 0 0 0.75em; font-size: 2em;} -h2 {margin: 0 0 1em; font-size: 1.5em;} -h3 {margin: 0 0 1.286em; font-size: 1.167em;} -h4 {margin: 0 0 1.5em; font-size: 1em;} -h5 {margin: 0 0 1.8em; font-size: .834em;} -h6 {margin: 0 0 2em; font-size: .75em;} - -p,ul,ol,dl,blockquote,pre {margin: 0;} - -li ul,li ol {margin: 0;} -ul {list-style:none;} -ol {list-style: outside decimal;} -li {margin: 0;} -dd {padding-left: 1.5em;} -blockquote {padding: 0 1.5em;} - -a {text-decoration: underline;} -a:hover {text-decoration: none;} -abbr,acronym {border-bottom: 1px dotted; cursor: help;} -del {text-decoration: line-through;} -ins {text-decoration: overline;} -sub {font-size: .834em; line-height: 1em; vertical-align: sub;} -sup {font-size: .834em; line-height: 1em; vertical-align: super;} - -tt,code,kbd,samp,pre {font-size: 1em; font-family: "Courier New", Courier, monospace;} - -/* Table styles */ -table {border-collapse: collapse; border-spacing: 0; margin: 0 0 1.5em; border:none;} -caption {text-align: left;} -th, td {padding: .25em .5em;} -tbody td, tbody th {/*border: 1px solid #000;*/} -tfoot {font-style: italic;} - -/* Form styles */ -fieldset {clear: both;} -legend {padding: 0 0 1.286em; font-size: 1.167em; font-weight: 700;} -fieldset fieldset legend {padding: 0 0 1.5em; font-size: 1em;} -* html legend {margin-left: -7px;} -*+html legend {margin-left: -7px;} - -form .field, form .buttons {clear: both; margin: 0 0 1.5em;} -form .field label {display: block;} -form ul.fields li {list-style-type: none; margin: 0;} -form ul.inline li, form ul.inline label {display: inline;} -form ul.inline li {padding: 0 .75em 0 0;} - -input.radio, input.checkbox {vertical-align: top;} -label, button, input.submit, input.image {cursor: pointer;} -* html input.radio, * html input.checkbox {vertical-align: middle;} -*+html input.radio, *+html input.checkbox {vertical-align: middle;} - -textarea {overflow: auto;} -input.text, input.password, textarea, select {margin: 0; font: 1em/1.3 Helvetica, Arial, "Liberation Sans", "Bitstream Vera Sans", sans-serif; vertical-align: baseline;} -input.text, input.password, textarea {border: 1px solid #444; border-bottom-color: #666; border-right-color: #666; padding: 2px;} - -* html button {margin: 0 .34em 0 0;} -*+html button {margin: 0 .34em 0 0;} - -form.horizontal .field {padding-left: 150px;} -form.horizontal .field label {display: inline; float: left; width: 140px; margin-left: -150px;} - -/* Useful classes */ -img.left {display: inline; float: left; margin: 0 1.5em .75em 0;} -img.right {display: inline; float: right; margin: 0 0 .75em .75em;} - -ul {color:#FFF; padding:0 10px 0 0;} - -body { - background:url(img/twicet_alternate_bg.png) #000 center top no-repeat; - font-family:'Lucida Grande','Lucida Sans Unicode',Tahoma,Arial,san-serif; -} - -.wrapper { - width:950px; - margin:0 auto 30px auto; - position:relative; -} - -.icons { - text-align:right; - height:20px; - padding:5px 10px; -} - -.hdr { - height:47px; - background:url(img/hdr-planet.jpg) #9DB8D2 right bottom no-repeat; - position:relative; - border-bottom:1px solid #000; -} - -.logo { - width:64px; - height:54px; - background:url(img/logo.png) no-repeat; - z-index:100; - position:absolute; - top:-2px; - left:10px; -} - -.top { - height:27px; - background:url(img/sites-bg.png) repeat-x; - margin:0 0 20px 0; -} - -.toplist1 li.home { - float:left; -} -.toplist1 li { - float:right; -} - -.toplist1 li a { - display:inline; - color:#FFF; - line-height:27px; - margin:0 0 0 10px; - font-family:"Trebuchet MS", Arial, Helvetica, sans-serif; - font-weight:bold; -} - -.toplist1 a#arsiv { - margin:0 5px 0 0; - padding:0 22px 0 0; - background:url(img/1276242580_arrow_large_up%20-%20Kopya.png) right center no-repeat; -} -.navlist { - display:none; - position:absolute; - z-index:1000; - margin:0 0 0 -400px; -} - -.navlist li { - float:left; - width:120px; - background:#000; - text-align:center; - background:url(img/sites-bg.png) repeat-x; -} - -.navlist li a { - display:block; - margin:0; - line-height:22px; -} - -.navlist li a:hover { - -} - -.contenttop { - background:url(img/bg_slice.png) no-repeat scroll transparent; - height:37px; - width:950px; -} - -.contenttop p { - line-height:37px; - padding:0 0 0 20px; - color:#FFF; - font-family:'Lucida Grande','Lucida Sans Unicode',Tahoma,Arial,san-serif; -} - -.content { - border-right:1px solid #CCC; - border-left:1px solid #CCC; - background:#FFF; -} - -.date { - padding:20px 0 0 20px; -} - -.separator { - height:10px; - background:#999; - border-top:1px solid #CCC; - border-bottom:1px solid #CCC; - margin:20px 0; - clear:both; -} - -.innercontent {padding:20px;} - -.face { - clear:both; - float:left; - width:80px; - height:80px; -} - -.title { - float:right; - text-align:center; - width:825px; - height:22px; -} - -.title a { - color: #000; -} - -.yazaneden { - float:right; - width:808px; - height:20px; - background:#FFFFDD; - padding:10px; - text-align:center; - margin:0 auto 20px; -} -.blogdate { - margin:0 20px 0 0; -} - -.blogcontent { - clear:both; - margin:0 20px 20px 20px; - font-family:'Lucida Grande','Lucida Sans Unicode',Tahoma,Arial,san-serif; - font-size:12.5px; -} - -.blogcontent p { - margin:16px 0 0 0; -} - -.blogcontent img { - float:right; - margin:0 0 20px 10px; -} - -.blogcontent ul { - margin:10px 0 10px 20px; - color:#000; -} - -.blogcontent ul li { - padding:0 0 4px 25px; - background:url(img/bullet.png) left center no-repeat; -} - -.footer { - width:951px; - height:66px; - background:url(img/footer_bg_slice.png) scroll no-repeat transparent; - left:-1px; - position:absolute; - padding:0 0 20px 0; -} - -.footer p { - line-height:45px; - color:#FFF; - padding:0 0 0 20px; -} +@charset "utf-8"; +/* CSS Document */ + +html, body, div, span, applet, object, iframe, +h1, h2, h3, h4, h5, h6, p, blockquote, pre, +a, abbr, acronym, address, big, cite, code, +del, dfn, em, font, img, ins, kbd, q, s, samp, +small, strike, strong, sub, sup, tt, var, +b, u, i, center, +dl, dt, dd, ol, ul, li, +fieldset, form, label, legend, +table, caption, tbody, tfoot, thead, tr, th, td, +header, nav, section, article, aside, footer +{border: 0; margin: 0; outline: 0; padding: 0; background: transparent; vertical-align: baseline;} + +blockquote, q {quotes: none;} +blockquote:before,blockquote:after,q:before,q:after {content: ''; content: none;} + +header, nav, section, article, aside, footer {display: block;} + +/* Basic styles */ +body {background: #fff; color: #000; font: .75em/1.5em Helvetica, Arial, "Liberation Sans", "Bitstream Vera Sans", sans-serif;} +html>body {font-size: 12px;} + +img {display: inline-block; vertical-align: bottom;} + +h1,h2,h3,h4,h5,h6,strong,b,dt,th {font-weight: 700;} +address,cite,em,i,caption,dfn,var {font-style: italic;} + +h1 {margin: 0 0 0.75em; font-size: 2em;} +h2 {margin: 0 0 1em; font-size: 1.5em;} +h3 {margin: 0 0 1.286em; font-size: 1.167em;} +h4 {margin: 0 0 1.5em; font-size: 1em;} +h5 {margin: 0 0 1.8em; font-size: .834em;} +h6 {margin: 0 0 2em; font-size: .75em;} + +p,ul,ol,dl,blockquote,pre {margin: 0;} + +li ul,li ol {margin: 0;} +ul {list-style:none;} +ol {list-style: outside decimal;} +li {margin: 0;} +dd {padding-left: 1.5em;} +blockquote {padding: 0 1.5em;} + +a {text-decoration: underline;} +a:hover {text-decoration: none;} +abbr,acronym {border-bottom: 1px dotted; cursor: help;} +del {text-decoration: line-through;} +ins {text-decoration: overline;} +sub {font-size: .834em; line-height: 1em; vertical-align: sub;} +sup {font-size: .834em; line-height: 1em; vertical-align: super;} + +tt,code,kbd,samp,pre {font-size: 1em; font-family: "Courier New", Courier, monospace;} + +/* Table styles */ +table {border-collapse: collapse; border-spacing: 0; margin: 0 0 1.5em; border:none;} +caption {text-align: left;} +th, td {padding: .25em .5em;} +tbody td, tbody th {/*border: 1px solid #000;*/} +tfoot {font-style: italic;} + +/* Form styles */ +fieldset {clear: both;} +legend {padding: 0 0 1.286em; font-size: 1.167em; font-weight: 700;} +fieldset fieldset legend {padding: 0 0 1.5em; font-size: 1em;} +* html legend {margin-left: -7px;} +*+html legend {margin-left: -7px;} + +form .field, form .buttons {clear: both; margin: 0 0 1.5em;} +form .field label {display: block;} +form ul.fields li {list-style-type: none; margin: 0;} +form ul.inline li, form ul.inline label {display: inline;} +form ul.inline li {padding: 0 .75em 0 0;} + +input.radio, input.checkbox {vertical-align: top;} +label, button, input.submit, input.image {cursor: pointer;} +* html input.radio, * html input.checkbox {vertical-align: middle;} +*+html input.radio, *+html input.checkbox {vertical-align: middle;} + +textarea {overflow: auto;} +input.text, input.password, textarea, select {margin: 0; font: 1em/1.3 Helvetica, Arial, "Liberation Sans", "Bitstream Vera Sans", sans-serif; vertical-align: baseline;} +input.text, input.password, textarea {border: 1px solid #444; border-bottom-color: #666; border-right-color: #666; padding: 2px;} + +* html button {margin: 0 .34em 0 0;} +*+html button {margin: 0 .34em 0 0;} + +form.horizontal .field {padding-left: 150px;} +form.horizontal .field label {display: inline; float: left; width: 140px; margin-left: -150px;} + +/* Useful classes */ +img.left {display: inline; float: left; margin: 0 1.5em .75em 0;} +img.right {display: inline; float: right; margin: 0 0 .75em .75em;} + +ul {color:#FFF; padding:0 10px 0 0;} + +body { + background:url(img/twicet_alternate_bg.png) #000 center top no-repeat; + font-family:'Lucida Grande','Lucida Sans Unicode',Tahoma,Arial,san-serif; +} + +.wrapper { + width:950px; + margin:0 auto 30px auto; + position:relative; +} + +.icons { + text-align:right; + height:20px; + padding:5px 10px; +} + +.hdr { + height:47px; + background:url(img/hdr-planet.jpg) #9DB8D2 right bottom no-repeat; + position:relative; + border-bottom:1px solid #000; +} + +.logo { + width:64px; + height:54px; + background:url(img/logo.png) no-repeat; + z-index:100; + position:absolute; + top:-2px; + left:10px; +} + +.top { + height:27px; + background:url(img/sites-bg.png) repeat-x; + margin:0 0 20px 0; +} + +.toplist1 li.home { + float:left; +} +.toplist1 li { + float:right; +} + +.toplist1 li a { + display:inline; + color:#FFF; + line-height:27px; + margin:0 0 0 10px; + font-family:"Trebuchet MS", Arial, Helvetica, sans-serif; + font-weight:bold; +} + +.toplist1 a#arsiv { + margin:0 5px 0 0; + padding:0 22px 0 0; + background:url(img/1276242580_arrow_large_up%20-%20Kopya.png) right center no-repeat; +} +.navlist { + display:none; + position:absolute; + z-index:1000; + margin:0 0 0 -400px; +} + +.navlist li { + float:left; + width:120px; + background:#000; + text-align:center; + background:url(img/sites-bg.png) repeat-x; +} + +.navlist li a { + display:block; + margin:0; + line-height:22px; +} + +.navlist li a:hover { + +} + +.contenttop { + background:url(img/bg_slice.png) no-repeat scroll transparent; + height:37px; + width:950px; +} + +.contenttop p { + line-height:37px; + padding:0 0 0 20px; + color:#FFF; + font-family:'Lucida Grande','Lucida Sans Unicode',Tahoma,Arial,san-serif; +} + +.content { + border-right:1px solid #CCC; + border-left:1px solid #CCC; + background:#FFF; +} + +.date { + padding:20px 0 0 20px; +} + +.separator { + height:10px; + background:#999; + border-top:1px solid #CCC; + border-bottom:1px solid #CCC; + margin:20px 0; + clear:both; +} + +.innercontent {padding:20px;} + +.face { + clear:both; + float:left; + width:80px; + height:80px; +} + +.title { + float:right; + text-align:center; + width:825px; + height:22px; +} + +.title a { + color: #000; +} + +.yazaneden { + float:right; + width:808px; + height:20px; + background:#FFFFDD; + padding:10px; + text-align:center; + margin:0 auto 20px; +} +.blogdate { + margin:0 20px 0 0; +} + +.blogcontent { + clear:both; + margin:0 20px 20px 20px; + font-family:'Lucida Grande','Lucida Sans Unicode',Tahoma,Arial,san-serif; + font-size:12.5px; +} + +.blogcontent p { + margin:16px 0 0 0; +} + +.blogcontent img { + margin:0 0 20px 10px; +} + +.blogcontent ul { + margin:10px 0 10px 20px; + color:#000; +} + +.blogcontent ul li{ + padding:0 0 4px 25px; + background:url(img/bullet.png) left center no-repeat; +} + +.footer { + width:951px; + height:66px; + background:url(img/footer_bg_slice.png) scroll no-repeat transparent; + left:-1px; + position:absolute; + padding:0 0 20px 0; +} + +.footer p { + line-height:45px; + color:white; + padding:0 0 0 20px; +} \ No newline at end of file diff --git a/DJAGEN/branches/mustafa_branch/djagen/templates/main/base.html b/DJAGEN/branches/mustafa_branch/djagen/templates/main/base.html index cd4dd6a..db317ee 100755 --- a/DJAGEN/branches/mustafa_branch/djagen/templates/main/base.html +++ b/DJAGEN/branches/mustafa_branch/djagen/templates/main/base.html @@ -24,8 +24,8 @@
- RSS - Atom + RSS + Atom
@@ -45,10 +45,12 @@ {% blocktrans %}
  • İngilizce Günlükler
    • {% endblocktrans %}
  • Arşiv
    • @@ -109,9 +111,7 @@ {% block footer%} {% endblock %} diff --git a/DJAGEN/branches/mustafa_branch/djagen/templates/main/query.html b/DJAGEN/branches/mustafa_branch/djagen/templates/main/query.html index 327eccf..fa78223 100755 --- a/DJAGEN/branches/mustafa_branch/djagen/templates/main/query.html +++ b/DJAGEN/branches/mustafa_branch/djagen/templates/main/query.html @@ -1,7 +1,7 @@ {% extends "main/base.html" %} {% block body %} {% comment %} -
    + Yazar
    Adı:     ve/veya Soyadı:
    @@ -11,7 +11,7 @@
    {% endcomment %} -
    + {% for field in q_form %}
    {% if field.errors %} diff --git a/DJAGEN/branches/mustafa_branch/djagen/urls.py b/DJAGEN/branches/mustafa_branch/djagen/urls.py index 4fa21cc..eeb43e9 100755 --- a/DJAGEN/branches/mustafa_branch/djagen/urls.py +++ b/DJAGEN/branches/mustafa_branch/djagen/urls.py @@ -19,7 +19,7 @@ urlpatterns = patterns('', (r'^main/', 'djagen.collector.views.main'), (r'^subscribe/', 'djagen.collector.views.member_subscribe'), (r'^members/', 'djagen.collector.views.list_members'), - (r'^archive/$','djagen.collector.views.archive'), + (r'^archive/$',archive), (r'^archive/(?P\d{4})/$', archive), (r'^archive/(?P\d{4})/(?P\d{1,2})/$', archive), (r'^archive/(?P\d{4})/(?P\d{1,2})/(?P\d{1,2})$', archive),