diff options
| -rw-r--r-- | scipy2016/urls.pyc | bin | 1635 -> 1642 bytes | |||
| -rw-r--r-- | website/forms.py | 101 | ||||
| -rw-r--r-- | website/forms.pyc | bin | 4320 -> 4397 bytes | |||
| -rw-r--r-- | website/models.py | 3 | ||||
| -rw-r--r-- | website/static/css/base.css | 3320 | ||||
| -rw-r--r-- | website/static/css/main.css | 80 | ||||
| -rw-r--r-- | website/templates/abstract-details.html | 35 | ||||
| -rw-r--r-- | website/templates/base.html | 433 | ||||
| -rw-r--r-- | website/templates/cfp.html | 107 | ||||
| -rw-r--r-- | website/templates/comment-abstract.html | 85 | ||||
| -rwxr-xr-x | website/templates/submit-cfp.html | 29 | ||||
| -rw-r--r-- | website/templates/submit-cfw.html | 29 | ||||
| -rw-r--r-- | website/templates/user-register.html | 34 | ||||
| -rw-r--r-- | website/templates/view-abstracts.html | 93 | ||||
| -rw-r--r-- | website/urls.py | 4 | ||||
| -rw-r--r-- | website/urls.pyc | bin | 1197 -> 1204 bytes | |||
| -rw-r--r-- | website/views.py | 132 | ||||
| -rw-r--r-- | website/views.pyc | bin | 8377 -> 8294 bytes |
18 files changed, 752 insertions, 3733 deletions
diff --git a/scipy2016/urls.pyc b/scipy2016/urls.pyc Binary files differindex a963a87..8fd086c 100644 --- a/scipy2016/urls.pyc +++ b/scipy2016/urls.pyc diff --git a/website/forms.py b/website/forms.py index 2ce8219..870c54a 100644 --- a/website/forms.py +++ b/website/forms.py @@ -9,20 +9,34 @@ from django.core.validators import MinLengthValidator, MinValueValidator, \ RegexValidator, URLValidator -class CommentForm(forms.ModelForm): +class CommentForm(forms.Form): pass - + class ProposalForm(forms.ModelForm): + error_css_class = 'error' + required_css_class = 'required' + # content_link = forms.CharField(required=False, help_text='Link to the content of your Talk') # speaker_link = forms.CharField(required=False, help_text='Link to information about the Speaker') + about_me = forms.CharField(widget=forms.Textarea(attrs={'class': 'form-control', 'placeholder': 'About Me'}), + required = True, + error_messages = {'required':'Title field required.'}, + label = '') attachment = forms.FileField(widget=forms.ClearableFileInput(attrs={'multiple': True})) - phone = forms.CharField(max_length = 12, widget=forms.TextInput(),required=False, validators = [RegexValidator(regex = '^[0-9-_+.]*$')]) - title = forms.CharField(widget=forms.TextInput(), + phone = forms.CharField(max_length = 12, widget=forms.TextInput(attrs={'class': 'form-control', 'placeholder': 'Phone'}),required=False, label = '', validators = [RegexValidator(regex = '^[0-9-_+.]*$')]) + title = forms.CharField(widget=forms.TextInput(attrs={'class': 'form-control', 'placeholder': 'Title'}), + required = True, + error_messages = {'required':'Title field required.'}, + label = '' + ) + abstract = forms.CharField(widget=forms.Textarea(attrs={'class': 'form-control', 'placeholder': 'Abstract'}), required = True, - error_messages = {'required':'Title field required.'}) + error_messages = {'required':'Title field required.'}, + label = '' + ) class Meta: model = Proposal - exclude = ('user', 'email','prerequisite') + exclude = ('user', 'email','prerequisite','status') def clean_title(self): title = self.cleaned_data['title'] @@ -30,28 +44,47 @@ class ProposalForm(forms.ModelForm): raise forms.ValidationError("This title already exist.") return title - # def clean_attachment(self): - # cleaned_data = self.cleaned_data - # attachment = cleaned_data.get('attachment', None) - # if attachment: - # # if not attachment.name.endswith('.pdf') : - # # raise forms.ValidationError('Only [.pdf] files are allowed') - # if attachment.size > (5*1024*1024): - # raise forms.ValidationError('File size exceeds 5MB') - # return attachment + def clean_attachment(self): + import os + cleaned_data = self.cleaned_data + attachment = cleaned_data.get('attachment', None) + if attachment: + ext = os.path.splitext(attachment.name)[1] + valid_extensions = ['.pdf','.zip','.rar'] + if not ext in valid_extensions: + raise forms.ValidationError(u'File not supported!') + if attachment.size > (5*1024*1024): + raise forms.ValidationError('File size exceeds 5MB') + return attachment class WorkshopForm(forms.ModelForm): + # content_link = forms.CharField(required=False, help_text='Link to the content of your Talk') + # speaker_link = forms.CharField(required=False, help_text='Link to information about the Speaker') + about_me = forms.CharField(widget=forms.Textarea(attrs={'class': 'form-control', 'placeholder': 'About Me'}), + required = True, + error_messages = {'required':'Title field required.'}, + label = '') attachment = forms.FileField(widget=forms.ClearableFileInput(attrs={'multiple': True})) - phone = forms.CharField(max_length = 12, widget=forms.TextInput(),required=False, validators = [RegexValidator(regex = '^[0-9-_+.]*$')]) - title = forms.CharField(widget=forms.TextInput(), + phone = forms.CharField(max_length = 12, widget=forms.TextInput(attrs={'class': 'form-control', 'placeholder': 'Phone'}),required=False, label = '', validators = [RegexValidator(regex = '^[0-9-_+.]*$')]) + title = forms.CharField(widget=forms.TextInput(attrs={'class': 'form-control', 'placeholder': 'Title'}), required = True, - error_messages = {'required':'Title field required.'}) - - + error_messages = {'required':'Title field required.'}, + label = '' + ) + abstract = forms.CharField(widget=forms.Textarea(attrs={'class': 'form-control', 'placeholder': 'Abstract'}), + required = True, + error_messages = {'required':'Title field required.'}, + label = '' + ) + prerequisite = forms.CharField(widget=forms.TextInput(attrs={'class': 'form-control', 'placeholder': 'Prerequisite'}), + required = True, + error_messages = {'required':'Title field required.'}, + label = '' + ) class Meta: model = Proposal - exclude = ('user', 'email') + exclude = ('user', 'email','status') def clean_title(self): title = self.cleaned_data['title'] @@ -65,6 +98,32 @@ class UserRegisterForm(UserCreationForm): model = User fields = ('first_name', 'last_name', 'email', 'username', 'password1', 'password2') + first_name = forms.CharField(widget=forms.TextInput(attrs={'placeholder': 'First Name'}), + label = '' + ) + last_name = forms.CharField(widget=forms.TextInput(attrs={'placeholder': 'Last Name'}), + label = '' + ) + email = forms.EmailField(widget=forms.TextInput(attrs={'placeholder': 'Email'}), + required = True, + error_messages = {'required':'Email field required.'}, + label = '' + ) + username = forms.CharField(widget=forms.TextInput(attrs={'placeholder': 'Username'}), + required = True, + error_messages = {'required':'Username field required.'}, + label = '' + ) + password1 = forms.CharField(widget=forms.PasswordInput(attrs={'placeholder': 'Password'}), + required = True, + error_messages = {'required':'Password field required.'}, + label = '' + ) + password2 = forms.CharField(widget=forms.PasswordInput(attrs={'placeholder': 'Confirm Password'}), + required = True, + error_messages = {'required':'Password Confirm field required.'}, + label = '' + ) class UserLoginForm(forms.Form): diff --git a/website/forms.pyc b/website/forms.pyc Binary files differindex 27fb812..39898a2 100644 --- a/website/forms.pyc +++ b/website/forms.pyc diff --git a/website/models.py b/website/models.py index c4236c6..53c5422 100644 --- a/website/models.py +++ b/website/models.py @@ -20,7 +20,8 @@ class Proposal(models.Model): attachment = models.FileField(upload_to=get_document_dir) date_created = models.DateTimeField(auto_now_add=True) date_modified = models.DateTimeField(auto_now=True) - + status = models.CharField(max_length = 100, default='Pending', editable=True) + class Comments(models.Model): proposal = models.ForeignKey(Proposal) diff --git a/website/static/css/base.css b/website/static/css/base.css index fc85d8d..e0dde7c 100644 --- a/website/static/css/base.css +++ b/website/static/css/base.css @@ -1,392 +1,4 @@ -/*! - * Bootstrap v3.1.0 (http://getbootstrap.com) - * Copyright 2011-2014 Twitter, Inc. - * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) - */ -/*! normalize.css v3.0.0 | MIT License | git.io/normalize */ - -body { - margin: 0; -} -article, -aside, -details, -figcaption, -figure, -footer, -header, -hgroup, -main, -section, -summary { - display: block; -} -audio, -canvas, -progress, -video { - display: inline-block; - vertical-align: baseline; -} -audio:not([controls]) { - display: none; - height: 0; -} -[hidden], -template { - display: none; -} -figure { - margin: 0; -} -img { - vertical-align: middle; -} -.img-responsive { - display: block; - max-width: 100%; - height: auto; - margin-top: 3%; -} -.img-rounded { - border-radius: 6px; -} -.img-thumbnail { - display: inline-block; - max-width: 100%; - height: auto; - padding: 4px; - line-height: 1.428571429; - background-color: #fff; - border: 1px solid #ddd; - border-radius: 4px; - -webkit-transition: all .2s ease-in-out; - transition: all .2s ease-in-out; -} -.img-circle { - border-radius: 50%; - width: 210px; - height:250px; -} -hr { - margin-top: 20px; - margin-bottom: 20px; - border: 0; - border-top: 1px solid #eee; -} -.sr-only { - position: absolute; - width: 1px; - height: 1px; - padding: 0; - margin: -1px; - overflow: hidden; - clip: rect(0, 0, 0, 0); - border: 0; -} - -p { - margin: 0 0 10px; -} -.lead { - margin-bottom: 20px; - font-size: 16px; - font-weight: 200; - line-height: 1.4; -} -@media (min-width: 768px) { - .lead { - font-size: 21px; - } -} -small, -.small { - font-size: 85%; -} -cite { - font-style: normal; -} -.text-left { - text-align: left; -} -.text-right { - text-align: right; -} -.text-center { - text-align: center; -} -.text-justify { - text-align: justify; -} -.text-muted { - color: #3676ab; -} -.text-primary { - color: #428bca; -} -a.text-primary:hover { - color: #3071a9; -} -.text-success { - color: #3c763d; -} -a.text-success:hover { - color: #2b542c; -} -.text-info { - color: #31708f; -} -a.text-info:hover { - color: #245269; -} -.text-warning { - color: #8a6d3b; -} -a.text-warning:hover { - color: #66512c; -} -.text-danger { - color: #a94442; -} -a.text-danger:hover { - color: #843534; -} -.bg-primary { - color: #fff; - background-color: #428bca; -} -a.bg-primary:hover { - background-color: #3071a9; -} -.bg-success { - background-color: #dff0d8; -} -a.bg-success:hover { - background-color: #c1e2b3; -} -.bg-info { - background-color: #d9edf7; -} -a.bg-info:hover { - background-color: #afd9ee; -} -.bg-warning { - background-color: #fcf8e3; -} -a.bg-warning:hover { - background-color: #f7ecb5; -} -.bg-danger { - background-color: #f2dede; -} -a.bg-danger:hover { - background-color: #e4b9b9; -} -.page-header { - padding-bottom: 9px; - margin: 40px 0 20px; - border-bottom: 1px solid #eee; -} -ul, -ol { - margin-top: 0; - margin-bottom: 10px; -} -ul ul, -ol ul, -ul ol, -ol ol { - margin-bottom: 0; -} -.list-unstyled { - padding-left: 0; - list-style: none; -} -.list-inline { - padding-left: 0; - list-style: none; -} -.list-inline > li { - display: inline-block; - padding-right: 5px; - padding-left: 5px; -} -.list-inline > li:first-child { - padding-left: 0; -} -dl { - margin-top: 0; - margin-bottom: 20px; -} -dt, -dd { - line-height: 1.428571429; -} -dt { - font-weight: bold; -} -dd { - margin-left: 0; -} -@media (min-width: 768px) { - .dl-horizontal dt { - float: left; - width: 160px; - overflow: hidden; - clear: left; - text-align: right; - text-overflow: ellipsis; - white-space: nowrap; - } - .dl-horizontal dd { - margin-left: 180px; - } -} -abbr[title], -abbr[data-original-title] { - cursor: help; - border-bottom: 1px dotted #3676ab; -} -.initialism { - font-size: 90%; - text-transform: uppercase; -} -blockquote { - padding: 10px 20px; - margin: 0 0 20px; - font-size: 17.5px; - border-left: 5px solid #eee; -} -blockquote p:last-child, -blockquote ul:last-child, -blockquote ol:last-child { - margin-bottom: 0; -} -blockquote footer, -blockquote small, -blockquote .small { - display: block; - font-size: 80%; - line-height: 1.428571429; - color: #3676ab; -} -blockquote footer:before, -blockquote small:before, -blockquote .small:before { - content: '\2014 \00A0'; -} -.blockquote-reverse, -blockquote.pull-right { - padding-right: 15px; - padding-left: 0; - text-align: right; - border-right: 5px solid #eee; - border-left: 0; -} -.blockquote-reverse footer:before, -blockquote.pull-right footer:before, -.blockquote-reverse small:before, -blockquote.pull-right small:before, -.blockquote-reverse .small:before, -blockquote.pull-right .small:before { - content: ''; -} -.blockquote-reverse footer:after, -blockquote.pull-right footer:after, -.blockquote-reverse small:after, -blockquote.pull-right small:after, -.blockquote-reverse .small:after, -blockquote.pull-right .small:after { - content: '\00A0 \2014'; -} -blockquote:before, -blockquote:after { - content: ""; -} -address { - margin-bottom: 20px; - font-style: normal; - line-height: 1.428571429; -} -code, -kbd, -pre, -samp { - font-family: Menlo, Monaco, Consolas, "Courier New", monospace; -} -code { - padding: 2px 4px; - font-size: 90%; - color: #c7254e; - white-space: nowrap; - background-color: #f9f2f4; - border-radius: 4px; -} -kbd { - padding: 2px 4px; - font-size: 90%; - color: #fff; - background-color: #333; - border-radius: 3px; - box-shadow: inset 0 -1px 0 rgba(0, 0, 0, .25); -} -pre { - display: block; - padding: 9.5px; - margin: 0 0 10px; - font-size: 13px; - line-height: 1.428571429; - color: #333; - word-break: break-all; - word-wrap: break-word; - background-color: #f5f5f5; - border: 1px solid #ccc; - border-radius: 4px; -} -pre code { - padding: 0; - font-size: inherit; - color: inherit; - white-space: pre-wrap; - background-color: transparent; - border-radius: 0; -} -.pre-scrollable { - max-height: 340px; - overflow-y: scroll; -} -.container { - padding-right: 15px; - padding-left: 15px; - margin-right: auto; - margin-left: auto; -} -@media (min-width: 768px) { - .container { - width: 750px; - } -} -@media (min-width: 992px) { - .container { - width: 970px; - } -} -@media (min-width: 1200px) { - .container { - width: 1170px; - } -} -.container-fluid { - padding-right: 15px; - padding-left: 15px; - margin-right: auto; - margin-left: auto; -} -.row { - margin-right: -15px; - margin-left: -15px; -} .col-xs-1, .col-sm-1, .col-md-1, .col-lg-1, .col-xs-2, .col-sm-2, .col-md-2, .col-lg-2, .col-xs-3, .col-sm-3, .col-md-3, .col-lg-3, .col-xs-4, .col-sm-4, .col-md-4, .col-lg-4, .col-xs-5, .col-sm-5, .col-md-5, .col-lg-5, .col-xs-6, .col-sm-6, .col-md-6, .col-lg-6, .col-xs-7, .col-sm-7, .col-md-7, .col-lg-7, .col-xs-8, .col-sm-8, .col-md-8, .col-lg-8, .col-xs-9, .col-sm-9, .col-md-9, .col-lg-9, .col-xs-10, .col-sm-10, .col-md-10, .col-lg-10, .col-xs-11, .col-sm-11, .col-md-11, .col-lg-11, .col-xs-12, .col-sm-12, .col-md-12, .col-lg-12 { position: relative; min-height: 1px; @@ -1023,235 +635,7 @@ pre code { margin-left: 0; } } -table { - max-width: 100%; - background-color: transparent; -} -th { - text-align: left; -} -.table { - width: 100%; - margin-bottom: 20px; -} -.table > thead > tr > th, -.table > tbody > tr > th, -.table > tfoot > tr > th, -.table > thead > tr > td, -.table > tbody > tr > td, -.table > tfoot > tr > td { - padding: 8px; - line-height: 1.428571429; - vertical-align: top; - border-top: 1px solid #ddd; -} -.table > thead > tr > th { - vertical-align: bottom; - border-bottom: 2px solid #ddd; -} -.table > caption + thead > tr:first-child > th, -.table > colgroup + thead > tr:first-child > th, -.table > thead:first-child > tr:first-child > th, -.table > caption + thead > tr:first-child > td, -.table > colgroup + thead > tr:first-child > td, -.table > thead:first-child > tr:first-child > td { - border-top: 0; -} -.table > tbody + tbody { - border-top: 2px solid #ddd; -} -.table .table { - background-color: #fff; -} -.table-condensed > thead > tr > th, -.table-condensed > tbody > tr > th, -.table-condensed > tfoot > tr > th, -.table-condensed > thead > tr > td, -.table-condensed > tbody > tr > td, -.table-condensed > tfoot > tr > td { - padding: 5px; -} -.table-bordered { - border: 1px solid #ddd; -} -.table-bordered > thead > tr > th, -.table-bordered > tbody > tr > th, -.table-bordered > tfoot > tr > th, -.table-bordered > thead > tr > td, -.table-bordered > tbody > tr > td, -.table-bordered > tfoot > tr > td { - border: 1px solid #ddd; -} -.table-bordered > thead > tr > th, -.table-bordered > thead > tr > td { - border-bottom-width: 2px; -} -.table-striped > tbody > tr:nth-child(odd) > td, -.table-striped > tbody > tr:nth-child(odd) > th { - background-color: #f9f9f9; -} -.table-hover > tbody > tr:hover > td, -.table-hover > tbody > tr:hover > th { - background-color: #f5f5f5; -} -table col[class*="col-"] { - position: static; - display: table-column; - float: none; -} -table td[class*="col-"], -table th[class*="col-"] { - position: static; - display: table-cell; - float: none; -} -.table > thead > tr > td.active, -.table > tbody > tr > td.active, -.table > tfoot > tr > td.active, -.table > thead > tr > th.active, -.table > tbody > tr > th.active, -.table > tfoot > tr > th.active, -.table > thead > tr.active > td, -.table > tbody > tr.active > td, -.table > tfoot > tr.active > td, -.table > thead > tr.active > th, -.table > tbody > tr.active > th, -.table > tfoot > tr.active > th { - background-color: #f5f5f5; -} -.table-hover > tbody > tr > td.active:hover, -.table-hover > tbody > tr > th.active:hover, -.table-hover > tbody > tr.active:hover > td, -.table-hover > tbody > tr.active:hover > th { - background-color: #e8e8e8; -} -.table > thead > tr > td.success, -.table > tbody > tr > td.success, -.table > tfoot > tr > td.success, -.table > thead > tr > th.success, -.table > tbody > tr > th.success, -.table > tfoot > tr > th.success, -.table > thead > tr.success > td, -.table > tbody > tr.success > td, -.table > tfoot > tr.success > td, -.table > thead > tr.success > th, -.table > tbody > tr.success > th, -.table > tfoot > tr.success > th { - background-color: #dff0d8; -} -.table-hover > tbody > tr > td.success:hover, -.table-hover > tbody > tr > th.success:hover, -.table-hover > tbody > tr.success:hover > td, -.table-hover > tbody > tr.success:hover > th { - background-color: #d0e9c6; -} -.table > thead > tr > td.info, -.table > tbody > tr > td.info, -.table > tfoot > tr > td.info, -.table > thead > tr > th.info, -.table > tbody > tr > th.info, -.table > tfoot > tr > th.info, -.table > thead > tr.info > td, -.table > tbody > tr.info > td, -.table > tfoot > tr.info > td, -.table > thead > tr.info > th, -.table > tbody > tr.info > th, -.table > tfoot > tr.info > th { - background-color: #d9edf7; -} -.table-hover > tbody > tr > td.info:hover, -.table-hover > tbody > tr > th.info:hover, -.table-hover > tbody > tr.info:hover > td, -.table-hover > tbody > tr.info:hover > th { - background-color: #c4e3f3; -} -.table > thead > tr > td.warning, -.table > tbody > tr > td.warning, -.table > tfoot > tr > td.warning, -.table > thead > tr > th.warning, -.table > tbody > tr > th.warning, -.table > tfoot > tr > th.warning, -.table > thead > tr.warning > td, -.table > tbody > tr.warning > td, -.table > tfoot > tr.warning > td, -.table > thead > tr.warning > th, -.table > tbody > tr.warning > th, -.table > tfoot > tr.warning > th { - background-color: #fcf8e3; -} -.table-hover > tbody > tr > td.warning:hover, -.table-hover > tbody > tr > th.warning:hover, -.table-hover > tbody > tr.warning:hover > td, -.table-hover > tbody > tr.warning:hover > th { - background-color: #faf2cc; -} -.table > thead > tr > td.danger, -.table > tbody > tr > td.danger, -.table > tfoot > tr > td.danger, -.table > thead > tr > th.danger, -.table > tbody > tr > th.danger, -.table > tfoot > tr > th.danger, -.table > thead > tr.danger > td, -.table > tbody > tr.danger > td, -.table > tfoot > tr.danger > td, -.table > thead > tr.danger > th, -.table > tbody > tr.danger > th, -.table > tfoot > tr.danger > th { - background-color: #f2dede; -} -.table-hover > tbody > tr > td.danger:hover, -.table-hover > tbody > tr > th.danger:hover, -.table-hover > tbody > tr.danger:hover > td, -.table-hover > tbody > tr.danger:hover > th { - background-color: #ebcccc; -} -@media (max-width: 767px) { - .table-responsive { - width: 100%; - margin-bottom: 15px; - overflow-x: scroll; - overflow-y: hidden; - -webkit-overflow-scrolling: touch; - -ms-overflow-style: -ms-autohiding-scrollbar; - border: 1px solid #ddd; - } - .table-responsive > .table { - margin-bottom: 0; - } - .table-responsive > .table > thead > tr > th, - .table-responsive > .table > tbody > tr > th, - .table-responsive > .table > tfoot > tr > th, - .table-responsive > .table > thead > tr > td, - .table-responsive > .table > tbody > tr > td, - .table-responsive > .table > tfoot > tr > td { - white-space: nowrap; - } - .table-responsive > .table-bordered { - border: 0; - } - .table-responsive > .table-bordered > thead > tr > th:first-child, - .table-responsive > .table-bordered > tbody > tr > th:first-child, - .table-responsive > .table-bordered > tfoot > tr > th:first-child, - .table-responsive > .table-bordered > thead > tr > td:first-child, - .table-responsive > .table-bordered > tbody > tr > td:first-child, - .table-responsive > .table-bordered > tfoot > tr > td:first-child { - border-left: 0; - } - .table-responsive > .table-bordered > thead > tr > th:last-child, - .table-responsive > .table-bordered > tbody > tr > th:last-child, - .table-responsive > .table-bordered > tfoot > tr > th:last-child, - .table-responsive > .table-bordered > thead > tr > td:last-child, - .table-responsive > .table-bordered > tbody > tr > td:last-child, - .table-responsive > .table-bordered > tfoot > tr > td:last-child { - border-right: 0; - } - .table-responsive > .table-bordered > tbody > tr:last-child > th, - .table-responsive > .table-bordered > tfoot > tr:last-child > th, - .table-responsive > .table-bordered > tbody > tr:last-child > td, - .table-responsive > .table-bordered > tfoot > tr:last-child > td { - border-bottom: 0; - } -} + fieldset { min-width: 0; padding: 0; @@ -1642,618 +1026,7 @@ select[multiple].input-lg { src: url('../fonts/glyphicons-halflings-regular.eot'); src: url('../fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'), url('../fonts/glyphicons-halflings-regular.woff') format('woff'), url('../fonts/glyphicons-halflings-regular.ttf') format('truetype'), url('../fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular') format('svg'); } -.glyphicon { - position: relative; - top: 1px; - display: inline-block; - font-family: 'Glyphicons Halflings'; - font-style: normal; - font-weight: normal; - line-height: 1; - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; -} -.glyphicon-asterisk:before { - content: "\2a"; -} -.glyphicon-plus:before { - content: "\2b"; -} -.glyphicon-euro:before { - content: "\20ac"; -} -.glyphicon-minus:before { - content: "\2212"; -} -.glyphicon-cloud:before { - content: "\2601"; -} -.glyphicon-envelope:before { - content: "\2709"; -} -.glyphicon-pencil:before { - content: "\270f"; -} -.glyphicon-glass:before { - content: "\e001"; -} -.glyphicon-music:before { - content: "\e002"; -} -.glyphicon-search:before { - content: "\e003"; -} -.glyphicon-heart:before { - content: "\e005"; -} -.glyphicon-star:before { - content: "\e006"; -} -.glyphicon-star-empty:before { - content: "\e007"; -} -.glyphicon-user:before { - content: "\e008"; -} -.glyphicon-film:before { - content: "\e009"; -} -.glyphicon-th-large:before { - content: "\e010"; -} -.glyphicon-th:before { - content: "\e011"; -} -.glyphicon-th-list:before { - content: "\e012"; -} -.glyphicon-ok:before { - content: "\e013"; -} -.glyphicon-remove:before { - content: "\e014"; -} -.glyphicon-zoom-in:before { - content: "\e015"; -} -.glyphicon-zoom-out:before { - content: "\e016"; -} -.glyphicon-off:before { - content: "\e017"; -} -.glyphicon-signal:before { - content: "\e018"; -} -.glyphicon-cog:before { - content: "\e019"; -} -.glyphicon-trash:before { - content: "\e020"; -} -.glyphicon-home:before { - content: "\e021"; -} -.glyphicon-file:before { - content: "\e022"; -} -.glyphicon-time:before { - content: "\e023"; -} -.glyphicon-road:before { - content: "\e024"; -} -.glyphicon-download-alt:before { - content: "\e025"; -} -.glyphicon-download:before { - content: "\e026"; -} -.glyphicon-upload:before { - content: "\e027"; -} -.glyphicon-inbox:before { - content: "\e028"; -} -.glyphicon-play-circle:before { - content: "\e029"; -} -.glyphicon-repeat:before { - content: "\e030"; -} -.glyphicon-refresh:before { - content: "\e031"; -} -.glyphicon-list-alt:before { - content: "\e032"; -} -.glyphicon-lock:before { - content: "\e033"; -} -.glyphicon-flag:before { - content: "\e034"; -} -.glyphicon-headphones:before { - content: "\e035"; -} -.glyphicon-volume-off:before { - content: "\e036"; -} -.glyphicon-volume-down:before { - content: "\e037"; -} -.glyphicon-volume-up:before { - content: "\e038"; -} -.glyphicon-qrcode:before { - content: "\e039"; -} -.glyphicon-barcode:before { - content: "\e040"; -} -.glyphicon-tag:before { - content: "\e041"; -} -.glyphicon-tags:before { - content: "\e042"; -} -.glyphicon-book:before { - content: "\e043"; -} -.glyphicon-bookmark:before { - content: "\e044"; -} -.glyphicon-print:before { - content: "\e045"; -} -.glyphicon-camera:before { - content: "\e046"; -} -.glyphicon-font:before { - content: "\e047"; -} -.glyphicon-bold:before { - content: "\e048"; -} -.glyphicon-italic:before { - content: "\e049"; -} -.glyphicon-text-height:before { - content: "\e050"; -} -.glyphicon-text-width:before { - content: "\e051"; -} -.glyphicon-align-left:before { - content: "\e052"; -} -.glyphicon-align-center:before { - content: "\e053"; -} -.glyphicon-align-right:before { - content: "\e054"; -} -.glyphicon-align-justify:before { - content: "\e055"; -} -.glyphicon-list:before { - content: "\e056"; -} -.glyphicon-indent-left:before { - content: "\e057"; -} -.glyphicon-indent-right:before { - content: "\e058"; -} -.glyphicon-facetime-video:before { - content: "\e059"; -} -.glyphicon-picture:before { - content: "\e060"; -} -.glyphicon-map-marker:before { - content: "\e062"; -} -.glyphicon-adjust:before { - content: "\e063"; -} -.glyphicon-tint:before { - content: "\e064"; -} -.glyphicon-edit:before { - content: "\e065"; -} -.glyphicon-share:before { - content: "\e066"; -} -.glyphicon-check:before { - content: "\e067"; -} -.glyphicon-move:before { - content: "\e068"; -} -.glyphicon-step-backward:before { - content: "\e069"; -} -.glyphicon-fast-backward:before { - content: "\e070"; -} -.glyphicon-backward:before { - content: "\e071"; -} -.glyphicon-play:before { - content: "\e072"; -} -.glyphicon-pause:before { - content: "\e073"; -} -.glyphicon-stop:before { - content: "\e074"; -} -.glyphicon-forward:before { - content: "\e075"; -} -.glyphicon-fast-forward:before { - content: "\e076"; -} -.glyphicon-step-forward:before { - content: "\e077"; -} -.glyphicon-eject:before { - content: "\e078"; -} -.glyphicon-chevron-left:before { - content: "\e079"; -} -.glyphicon-chevron-right:before { - content: "\e080"; -} -.glyphicon-plus-sign:before { - content: "\e081"; -} -.glyphicon-minus-sign:before { - content: "\e082"; -} -.glyphicon-remove-sign:before { - content: "\e083"; -} -.glyphicon-ok-sign:before { - content: "\e084"; -} -.glyphicon-question-sign:before { - content: "\e085"; -} -.glyphicon-info-sign:before { - content: "\e086"; -} -.glyphicon-screenshot:before { - content: "\e087"; -} -.glyphicon-remove-circle:before { - content: "\e088"; -} -.glyphicon-ok-circle:before { - content: "\e089"; -} -.glyphicon-ban-circle:before { - content: "\e090"; -} -.glyphicon-arrow-left:before { - content: "\e091"; -} -.glyphicon-arrow-right:before { - content: "\e092"; -} -.glyphicon-arrow-up:before { - content: "\e093"; -} -.glyphicon-arrow-down:before { - content: "\e094"; -} -.glyphicon-share-alt:before { - content: "\e095"; -} -.glyphicon-resize-full:before { - content: "\e096"; -} -.glyphicon-resize-small:before { - content: "\e097"; -} -.glyphicon-exclamation-sign:before { - content: "\e101"; -} -.glyphicon-gift:before { - content: "\e102"; -} -.glyphicon-leaf:before { - content: "\e103"; -} -.glyphicon-fire:before { - content: "\e104"; -} -.glyphicon-eye-open:before { - content: "\e105"; -} -.glyphicon-eye-close:before { - content: "\e106"; -} -.glyphicon-warning-sign:before { - content: "\e107"; -} -.glyphicon-plane:before { - content: "\e108"; -} -.glyphicon-calendar:before { - content: "\e109"; -} -.glyphicon-random:before { - content: "\e110"; -} -.glyphicon-comment:before { - content: "\e111"; -} -.glyphicon-magnet:before { - content: "\e112"; -} -.glyphicon-chevron-up:before { - content: "\e113"; -} -.glyphicon-chevron-down:before { - content: "\e114"; -} -.glyphicon-retweet:before { - content: "\e115"; -} -.glyphicon-shopping-cart:before { - content: "\e116"; -} -.glyphicon-folder-close:before { - content: "\e117"; -} -.glyphicon-folder-open:before { - content: "\e118"; -} -.glyphicon-resize-vertical:before { - content: "\e119"; -} -.glyphicon-resize-horizontal:before { - content: "\e120"; -} -.glyphicon-hdd:before { - content: "\e121"; -} -.glyphicon-bullhorn:before { - content: "\e122"; -} -.glyphicon-bell:before { - content: "\e123"; -} -.glyphicon-certificate:before { - content: "\e124"; -} -.glyphicon-thumbs-up:before { - content: "\e125"; -} -.glyphicon-thumbs-down:before { - content: "\e126"; -} -.glyphicon-hand-right:before { - content: "\e127"; -} -.glyphicon-hand-left:before { - content: "\e128"; -} -.glyphicon-hand-up:before { - content: "\e129"; -} -.glyphicon-hand-down:before { - content: "\e130"; -} -.glyphicon-circle-arrow-right:before { - content: "\e131"; -} -.glyphicon-circle-arrow-left:before { - content: "\e132"; -} -.glyphicon-circle-arrow-up:before { - content: "\e133"; -} -.glyphicon-circle-arrow-down:before { - content: "\e134"; -} -.glyphicon-globe:before { - content: "\e135"; -} -.glyphicon-wrench:before { - content: "\e136"; -} -.glyphicon-tasks:before { - content: "\e137"; -} -.glyphicon-filter:before { - content: "\e138"; -} -.glyphicon-briefcase:before { - content: "\e139"; -} -.glyphicon-fullscreen:before { - content: "\e140"; -} -.glyphicon-dashboard:before { - content: "\e141"; -} -.glyphicon-paperclip:before { - content: "\e142"; -} -.glyphicon-heart-empty:before { - content: "\e143"; -} -.glyphicon-link:before { - content: "\e144"; -} -.glyphicon-phone:before { - content: "\e145"; -} -.glyphicon-pushpin:before { - content: "\e146"; -} -.glyphicon-usd:before { - content: "\e148"; -} -.glyphicon-gbp:before { - content: "\e149"; -} -.glyphicon-sort:before { - content: "\e150"; -} -.glyphicon-sort-by-alphabet:before { - content: "\e151"; -} -.glyphicon-sort-by-alphabet-alt:before { - content: "\e152"; -} -.glyphicon-sort-by-order:before { - content: "\e153"; -} -.glyphicon-sort-by-order-alt:before { - content: "\e154"; -} -.glyphicon-sort-by-attributes:before { - content: "\e155"; -} -.glyphicon-sort-by-attributes-alt:before { - content: "\e156"; -} -.glyphicon-unchecked:before { - content: "\e157"; -} -.glyphicon-expand:before { - content: "\e158"; -} -.glyphicon-collapse-down:before { - content: "\e159"; -} -.glyphicon-collapse-up:before { - content: "\e160"; -} -.glyphicon-log-in:before { - content: "\e161"; -} -.glyphicon-flash:before { - content: "\e162"; -} -.glyphicon-log-out:before { - content: "\e163"; -} -.glyphicon-new-window:before { - content: "\e164"; -} -.glyphicon-record:before { - content: "\e165"; -} -.glyphicon-save:before { - content: "\e166"; -} -.glyphicon-open:before { - content: "\e167"; -} -.glyphicon-saved:before { - content: "\e168"; -} -.glyphicon-import:before { - content: "\e169"; -} -.glyphicon-export:before { - content: "\e170"; -} -.glyphicon-send:before { - content: "\e171"; -} -.glyphicon-floppy-disk:before { - content: "\e172"; -} -.glyphicon-floppy-saved:before { - content: "\e173"; -} -.glyphicon-floppy-remove:before { - content: "\e174"; -} -.glyphicon-floppy-save:before { - content: "\e175"; -} -.glyphicon-floppy-open:before { - content: "\e176"; -} -.glyphicon-credit-card:before { - content: "\e177"; -} -.glyphicon-transfer:before { - content: "\e178"; -} -.glyphicon-cutlery:before { - content: "\e179"; -} -.glyphicon-header:before { - content: "\e180"; -} -.glyphicon-compressed:before { - content: "\e181"; -} -.glyphicon-earphone:before { - content: "\e182"; -} -.glyphicon-phone-alt:before { - content: "\e183"; -} -.glyphicon-tower:before { - content: "\e184"; -} -.glyphicon-stats:before { - content: "\e185"; -} -.glyphicon-sd-video:before { - content: "\e186"; -} -.glyphicon-hd-video:before { - content: "\e187"; -} -.glyphicon-subtitles:before { - content: "\e188"; -} -.glyphicon-sound-stereo:before { - content: "\e189"; -} -.glyphicon-sound-dolby:before { - content: "\e190"; -} -.glyphicon-sound-5-1:before { - content: "\e191"; -} -.glyphicon-sound-6-1:before { - content: "\e192"; -} -.glyphicon-sound-7-1:before { - content: "\e193"; -} -.glyphicon-copyright-mark:before { - content: "\e194"; -} -.glyphicon-registration-mark:before { - content: "\e195"; -} -.glyphicon-cloud-download:before { - content: "\e197"; -} -.glyphicon-cloud-upload:before { - content: "\e198"; -} -.glyphicon-tree-conifer:before { - content: "\e199"; -} -.glyphicon-tree-deciduous:before { - content: "\e200"; -} .caret { display: inline-block; width: 0; @@ -2392,341 +1165,8 @@ select[multiple].input-lg { left: 0; } } -.btn-group, -.btn-group-vertical { - position: relative; - display: inline-block; - vertical-align: middle; -} -.btn-group > .btn, -.btn-group-vertical > .btn { - position: relative; - float: left; -} -.btn-group > .btn:hover, -.btn-group-vertical > .btn:hover, -.btn-group > .btn:focus, -.btn-group-vertical > .btn:focus, -.btn-group > .btn:active, -.btn-group-vertical > .btn:active, -.btn-group > .btn.active, -.btn-group-vertical > .btn.active { - z-index: 2; -} -.btn-group > .btn:focus, -.btn-group-vertical > .btn:focus { - outline: none; -} -.btn-group .btn + .btn, -.btn-group .btn + .btn-group, -.btn-group .btn-group + .btn, -.btn-group .btn-group + .btn-group { - margin-left: -1px; -} -.btn-toolbar { - margin-left: -5px; -} -.btn-toolbar .btn-group, -.btn-toolbar .input-group { - float: left; -} -.btn-toolbar > .btn, -.btn-toolbar > .btn-group, -.btn-toolbar > .input-group { - margin-left: 5px; -} -.btn-group > .btn:not(:first-child):not(:last-child):not(.dropdown-toggle) { - border-radius: 0; -} -.btn-group > .btn:first-child { - margin-left: 0; -} -.btn-group > .btn:first-child:not(:last-child):not(.dropdown-toggle) { - border-top-right-radius: 0; - border-bottom-right-radius: 0; -} -.btn-group > .btn:last-child:not(:first-child), -.btn-group > .dropdown-toggle:not(:first-child) { - border-top-left-radius: 0; - border-bottom-left-radius: 0; -} -.btn-group > .btn-group { - float: left; -} -.btn-group > .btn-group:not(:first-child):not(:last-child) > .btn { - border-radius: 0; -} -.btn-group > .btn-group:first-child > .btn:last-child, -.btn-group > .btn-group:first-child > .dropdown-toggle { - border-top-right-radius: 0; - border-bottom-right-radius: 0; -} -.btn-group > .btn-group:last-child > .btn:first-child { - border-top-left-radius: 0; - border-bottom-left-radius: 0; -} -.btn-group .dropdown-toggle:active, -.btn-group.open .dropdown-toggle { - outline: 0; -} -.btn-group-xs > .btn { - padding: 1px 5px; - font-size: 12px; - line-height: 1.5; - border-radius: 3px; -} -.btn-group-sm > .btn { - padding: 5px 10px; - font-size: 12px; - line-height: 1.5; - border-radius: 3px; -} -.btn-group-lg > .btn { - padding: 10px 16px; - font-size: 18px; - line-height: 1.33; - border-radius: 6px; -} -.btn-group > .btn + .dropdown-toggle { - padding-right: 8px; - padding-left: 8px; -} -.btn-group > .btn-lg + .dropdown-toggle { - padding-right: 12px; - padding-left: 12px; -} -.btn-group.open .dropdown-toggle { - -webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125); - box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125); -} -.btn-group.open .dropdown-toggle.btn-link { - -webkit-box-shadow: none; - box-shadow: none; -} -.btn .caret { - margin-left: 0; -} -.btn-lg .caret { - border-width: 5px 5px 0; - border-bottom-width: 0; -} -.dropup .btn-lg .caret { - border-width: 0 5px 5px; -} -.btn-group-vertical > .btn, -.btn-group-vertical > .btn-group, -.btn-group-vertical > .btn-group > .btn { - display: block; - float: none; - width: 100%; - max-width: 100%; -} -.btn-group-vertical > .btn-group > .btn { - float: none; -} -.btn-group-vertical > .btn + .btn, -.btn-group-vertical > .btn + .btn-group, -.btn-group-vertical > .btn-group + .btn, -.btn-group-vertical > .btn-group + .btn-group { - margin-top: -1px; - margin-left: 0; -} -.btn-group-vertical > .btn:not(:first-child):not(:last-child) { - border-radius: 0; -} -.btn-group-vertical > .btn:first-child:not(:last-child) { - border-top-right-radius: 4px; - border-bottom-right-radius: 0; - border-bottom-left-radius: 0; -} -.btn-group-vertical > .btn:last-child:not(:first-child) { - border-top-left-radius: 0; - border-top-right-radius: 0; - border-bottom-left-radius: 4px; -} -.btn-group-vertical > .btn-group:not(:first-child):not(:last-child) > .btn { - border-radius: 0; -} -.btn-group-vertical > .btn-group:first-child:not(:last-child) > .btn:last-child, -.btn-group-vertical > .btn-group:first-child:not(:last-child) > .dropdown-toggle { - border-bottom-right-radius: 0; - border-bottom-left-radius: 0; -} -.btn-group-vertical > .btn-group:last-child:not(:first-child) > .btn:first-child { - border-top-left-radius: 0; - border-top-right-radius: 0; -} -.btn-group-justified { - display: table; - width: 100%; - table-layout: fixed; - border-collapse: separate; -} -.btn-group-justified > .btn, -.btn-group-justified > .btn-group { - display: table-cell; - float: none; - width: 1%; -} -.btn-group-justified > .btn-group .btn { - width: 100%; -} -[data-toggle="buttons"] > .btn > input[type="radio"], -[data-toggle="buttons"] > .btn > input[type="checkbox"] { - display: none; -} -.input-group { - position: relative; - display: table; - border-collapse: separate; -} -.input-group[class*="col-"] { - float: none; - padding-right: 0; - padding-left: 0; -} -.input-group .form-control { - float: left; - width: 100%; - margin-bottom: 0; -} -.input-group-lg > .form-control, -.input-group-lg > .input-group-addon, -.input-group-lg > .input-group-btn > .btn { - height: 46px; - padding: 10px 16px; - font-size: 18px; - line-height: 1.33; - border-radius: 6px; -} -select.input-group-lg > .form-control, -select.input-group-lg > .input-group-addon, -select.input-group-lg > .input-group-btn > .btn { - height: 46px; - line-height: 46px; -} -textarea.input-group-lg > .form-control, -textarea.input-group-lg > .input-group-addon, -textarea.input-group-lg > .input-group-btn > .btn, -select[multiple].input-group-lg > .form-control, -select[multiple].input-group-lg > .input-group-addon, -select[multiple].input-group-lg > .input-group-btn > .btn { - height: auto; -} -.input-group-sm > .form-control, -.input-group-sm > .input-group-addon, -.input-group-sm > .input-group-btn > .btn { - height: 30px; - padding: 5px 10px; - font-size: 12px; - line-height: 1.5; - border-radius: 3px; -} -select.input-group-sm > .form-control, -select.input-group-sm > .input-group-addon, -select.input-group-sm > .input-group-btn > .btn { - height: 30px; - line-height: 30px; -} -textarea.input-group-sm > .form-control, -textarea.input-group-sm > .input-group-addon, -textarea.input-group-sm > .input-group-btn > .btn, -select[multiple].input-group-sm > .form-control, -select[multiple].input-group-sm > .input-group-addon, -select[multiple].input-group-sm > .input-group-btn > .btn { - height: auto; -} -.input-group-addon, -.input-group-btn, -.input-group .form-control { - display: table-cell; -} -.input-group-addon:not(:first-child):not(:last-child), -.input-group-btn:not(:first-child):not(:last-child), -.input-group .form-control:not(:first-child):not(:last-child) { - border-radius: 0; -} -.input-group-addon, -.input-group-btn { - width: 1%; - white-space: nowrap; - vertical-align: middle; -} -.input-group-addon { - padding: 6px 12px; - font-size: 14px; - font-weight: normal; - line-height: 1; - color: #555; - text-align: center; - background-color: #eee; - border: 1px solid #ccc; - border-radius: 4px; -} -.input-group-addon.input-sm { - padding: 5px 10px; - font-size: 12px; - border-radius: 3px; -} -.input-group-addon.input-lg { - padding: 10px 16px; - font-size: 18px; - border-radius: 6px; -} -.input-group-addon input[type="radio"], -.input-group-addon input[type="checkbox"] { - margin-top: 0; -} -.input-group .form-control:first-child, -.input-group-addon:first-child, -.input-group-btn:first-child > .btn, -.input-group-btn:first-child > .btn-group > .btn, -.input-group-btn:first-child > .dropdown-toggle, -.input-group-btn:last-child > .btn:not(:last-child):not(.dropdown-toggle), -.input-group-btn:last-child > .btn-group:not(:last-child) > .btn { - border-top-right-radius: 0; - border-bottom-right-radius: 0; -} -.input-group-addon:first-child { - border-right: 0; -} -.input-group .form-control:last-child, -.input-group-addon:last-child, -.input-group-btn:last-child > .btn, -.input-group-btn:last-child > .btn-group > .btn, -.input-group-btn:last-child > .dropdown-toggle, -.input-group-btn:first-child > .btn:not(:first-child), -.input-group-btn:first-child > .btn-group:not(:first-child) > .btn { - border-top-left-radius: 0; - border-bottom-left-radius: 0; -} -.input-group-addon:last-child { - border-left: 0; -} -.input-group-btn { - position: relative; - font-size: 0; - white-space: nowrap; -} -.input-group-btn > .btn { - position: relative; -} -.input-group-btn > .btn + .btn { - margin-left: -1px; -} -.input-group-btn > .btn:hover, -.input-group-btn > .btn:focus, -.input-group-btn > .btn:active { - z-index: 2; -} -.input-group-btn:first-child > .btn, -.input-group-btn:first-child > .btn-group { - margin-right: -1px; -} -.input-group-btn:last-child > .btn, -.input-group-btn:last-child > .btn-group { - margin-left: -1px; -} + + .nav { padding-left: 0; margin-bottom: 0; @@ -2777,12 +1217,17 @@ select[multiple].input-group-sm > .input-group-btn > .btn { .nav-tabs > li { float: left; margin-bottom: -1px; + /*background: #505050 ;*/ + } .nav-tabs > li > a { margin-right: 2px; line-height: 1.428571429; border: 1px solid transparent; border-radius: 4px 4px 0 0; + background: #D44727; + color: white; + } .nav-tabs > li > a:hover { border-color: #eee #eee #ddd; @@ -2791,6 +1236,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn { .nav-tabs > li.active > a:hover, .nav-tabs > li.active > a:focus { color: #555; + text-decoration: underline; cursor: default; background-color: #fff; border: 1px solid #ddd; @@ -2921,9 +1367,10 @@ select[multiple].input-group-sm > .input-group-btn > .btn { } .navbar { position: relative; - min-height: 50px; - margin-bottom: 20px; +/* min-height: 50px;*/ border: 1px solid transparent; + text-align: center; + } @media (min-width: 768px) { .navbar { @@ -3097,7 +1544,8 @@ select[multiple].input-group-sm > .input-group-btn > .btn { } @media (min-width: 768px) { .navbar-nav { - float: left; + /*float: left;*/ + display: inline-block; margin: 0; } .navbar-nav > li { @@ -3105,7 +1553,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn { } .navbar-nav > li > a { padding-top: 15px; - padding-bottom: 15px; + padding-bottom: 10px; } .navbar-nav.navbar-right:last-child { margin-right: -15px; @@ -3301,7 +1749,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn { color: #3676ab; } .navbar-inverse { - background-color: #ffca39; + background-color: #333333; color: #3676ab; font-size: 20px; font-weight: 500; @@ -3317,19 +1765,19 @@ select[multiple].input-group-sm > .input-group-btn > .btn { color: #3676ab; } .navbar-inverse .navbar-nav > li > a { - color: #3676ab; + color: #CBCBCB; font-size: 18px; } .navbar-inverse .navbar-nav > li > a:hover, .navbar-inverse .navbar-nav > li > a:focus { - color: #3676ab; + color: #636363; background-color: transparent; } .navbar-inverse .navbar-nav > .active > a, .navbar-inverse .navbar-nav > .active > a:hover, .navbar-inverse .navbar-nav > .active > a:focus { - color: #ffca39; - background-color: #3676ab; + color: white; + background-color: #636363; } .navbar-inverse .navbar-nav > .disabled > a, .navbar-inverse .navbar-nav > .disabled > a:hover, @@ -3354,8 +1802,8 @@ select[multiple].input-group-sm > .input-group-btn > .btn { .navbar-inverse .navbar-nav > .open > a, .navbar-inverse .navbar-nav > .open > a:hover, .navbar-inverse .navbar-nav > .open > a:focus { - color: #ffca39; - background-color: #3676ab; + color: #cbcbcb; + background-color: #636363; } @media (max-width: 767px) { .navbar-inverse .navbar-nav .open .dropdown-menu > .dropdown-header { @@ -3391,1725 +1839,12 @@ select[multiple].input-group-sm > .input-group-btn > .btn { .navbar-inverse .navbar-link:hover { color: #fff; } -.breadcrumb { - padding: 8px 15px; - margin-bottom: 20px; - list-style: none; - background-color: #f5f5f5; - border-radius: 4px; -} -.breadcrumb > li { - display: inline-block; -} -.breadcrumb > li + li:before { - padding: 0 5px; - color: #ccc; - content: "/\00a0"; -} -.breadcrumb > .active { - color: #3676ab; -} -.pagination { - display: inline-block; - padding-left: 0; - margin: 20px 0; - border-radius: 4px; -} -.pagination > li { - display: inline; -} -.pagination > li > a, -.pagination > li > span { - position: relative; - float: left; - padding: 6px 12px; - margin-left: -1px; - line-height: 1.428571429; - color: #428bca; - text-decoration: none; - background-color: #fff; - border: 1px solid #ddd; -} -.pagination > li:first-child > a, -.pagination > li:first-child > span { - margin-left: 0; - border-top-left-radius: 4px; - border-bottom-left-radius: 4px; -} -.pagination > li:last-child > a, -.pagination > li:last-child > span { - border-top-right-radius: 4px; - border-bottom-right-radius: 4px; -} -.pagination > li > a:hover, -.pagination > li > span:hover, -.pagination > li > a:focus, -.pagination > li > span:focus { - color: #2a6496; - background-color: #eee; - border-color: #ddd; -} -.pagination > .active > a, -.pagination > .active > span, -.pagination > .active > a:hover, -.pagination > .active > span:hover, -.pagination > .active > a:focus, -.pagination > .active > span:focus { - z-index: 2; - color: #fff; - cursor: default; - background-color: #428bca; - border-color: #428bca; -} -.pagination > .disabled > span, -.pagination > .disabled > span:hover, -.pagination > .disabled > span:focus, -.pagination > .disabled > a, -.pagination > .disabled > a:hover, -.pagination > .disabled > a:focus { - color: #3676ab; - cursor: not-allowed; - background-color: #fff; - border-color: #ddd; -} -.pagination-lg > li > a, -.pagination-lg > li > span { - padding: 10px 16px; - font-size: 18px; -} -.pagination-lg > li:first-child > a, -.pagination-lg > li:first-child > span { - border-top-left-radius: 6px; - border-bottom-left-radius: 6px; -} -.pagination-lg > li:last-child > a, -.pagination-lg > li:last-child > span { - border-top-right-radius: 6px; - border-bottom-right-radius: 6px; -} -.pagination-sm > li > a, -.pagination-sm > li > span { - padding: 5px 10px; - font-size: 12px; -} -.pagination-sm > li:first-child > a, -.pagination-sm > li:first-child > span { - border-top-left-radius: 3px; - border-bottom-left-radius: 3px; -} -.pagination-sm > li:last-child > a, -.pagination-sm > li:last-child > span { - border-top-right-radius: 3px; - border-bottom-right-radius: 3px; -} -.pager { - padding-left: 0; - margin: 20px 0; - text-align: center; - list-style: none; -} -.pager li { - display: inline; -} -.pager li > a, -.pager li > span { - display: inline-block; - padding: 5px 14px; - background-color: #fff; - border: 1px solid #ddd; - border-radius: 15px; -} -.pager li > a:hover, -.pager li > a:focus { - text-decoration: none; - background-color: #eee; -} -.pager .next > a, -.pager .next > span { - float: right; -} -.pager .previous > a, -.pager .previous > span { - float: left; -} -.pager .disabled > a, -.pager .disabled > a:hover, -.pager .disabled > a:focus, -.pager .disabled > span { - color: #3676ab; - cursor: not-allowed; - background-color: #fff; -} -.label { - display: inline; - padding: .2em .6em .3em; - font-size: 75%; - font-weight: bold; - line-height: 1; - color: #fff; - text-align: center; - white-space: nowrap; - vertical-align: baseline; - border-radius: .25em; -} -.label[href]:hover, -.label[href]:focus { - color: #fff; - text-decoration: none; - cursor: pointer; -} -.label:empty { - display: none; -} -.btn .label { - position: relative; - top: -1px; -} -.label-default { - background-color: #3676ab; -} -.label-default[href]:hover, -.label-default[href]:focus { - background-color: #808080; -} -.label-primary { - background-color: #428bca; -} -.label-primary[href]:hover, -.label-primary[href]:focus { - background-color: #3071a9; -} -.label-success { - background-color: #5cb85c; -} -.label-success[href]:hover, -.label-success[href]:focus { - background-color: #449d44; -} -.label-info { - background-color: #5bc0de; -} -.label-info[href]:hover, -.label-info[href]:focus { - background-color: #31b0d5; -} -.label-warning { - background-color: #f0ad4e; -} -.label-warning[href]:hover, -.label-warning[href]:focus { - background-color: #ec971f; -} -.label-danger { - background-color: #d9534f; -} -.label-danger[href]:hover, -.label-danger[href]:focus { - background-color: #c9302c; -} -.badge { - display: inline-block; - min-width: 10px; - padding: 3px 7px; - font-size: 12px; - font-weight: bold; - line-height: 1; - color: #fff; - text-align: center; - white-space: nowrap; - vertical-align: baseline; - background-color: #3676ab; - border-radius: 10px; -} -.badge:empty { - display: none; -} -.btn .badge { - position: relative; - top: -1px; -} -.btn-xs .badge { - top: 0; - padding: 1px 5px; -} -a.badge:hover, -a.badge:focus { - color: #fff; - text-decoration: none; - cursor: pointer; -} -a.list-group-item.active > .badge, -.nav-pills > .active > a > .badge { - color: #428bca; - background-color: #fff; -} -.nav-pills > li > a > .badge { - margin-left: 3px; -} -.jumbotron { - padding: 30px; - margin-bottom: 30px; - color: inherit; - background-color: #eee; -} -.jumbotron h1, -.jumbotron .h1 { - color: inherit; -} -.jumbotron p { - margin-bottom: 15px; - font-size: 21px; - font-weight: 200; -} -.container .jumbotron { - border-radius: 6px; -} -.jumbotron .container { - max-width: 100%; -} -@media screen and (min-width: 768px) { - .jumbotron { - padding-top: 48px; - padding-bottom: 48px; - } - .container .jumbotron { - padding-right: 60px; - padding-left: 60px; - } - .jumbotron h1, - .jumbotron .h1 { - font-size: 63px; - } -} -.thumbnail { - display: block; - padding: 4px; - margin-bottom: 20px; - line-height: 1.428571429; - background-color: #fff; - border: 1px solid #ddd; - border-radius: 4px; - -webkit-transition: all .2s ease-in-out; - transition: all .2s ease-in-out; -} -.thumbnail > img, -.thumbnail a > img { - display: block; - max-width: 100%; - height: auto; - margin-right: auto; - margin-left: auto; -} -a.thumbnail:hover, -a.thumbnail:focus, -a.thumbnail.active { - border-color: #428bca; -} -.thumbnail .caption { - padding: 9px; - color: #333; -} -.alert { - padding: 15px; - margin-bottom: 20px; - border: 1px solid transparent; - border-radius: 4px; -} -.alert h4 { - margin-top: 0; - color: inherit; -} -.alert .alert-link { - font-weight: bold; -} -.alert > p, -.alert > ul { - margin-bottom: 0; -} -.alert > p + p { - margin-top: 5px; -} -.alert-dismissable { - padding-right: 35px; -} -.alert-dismissable .close { - position: relative; - top: -2px; - right: -21px; - color: inherit; -} -.alert-success { - color: #3676ab; - background-color: #B0D5A0; - border-color: #d6e9c6; -} -.alert-success hr { - border-top-color: #c9e2b3; -} -.alert-success .alert-link { - color: #2b542c; -} -.alert-info { - color: #31708f; - background-color: #d9edf7; - border-color: #bce8f1; -} -.alert-info hr { - border-top-color: #a6e1ec; -} -.alert-info .alert-link { - color: #245269; -} -.alert-warning { - color: #8a6d3b; - background-color: #fcf8e3; - border-color: #faebcc; -} -.alert-warning hr { - border-top-color: #f7e1b5; -} -.alert-warning .alert-link { - color: #66512c; -} -.alert-danger { - color: #a94442; - background-color: #f2dede; - border-color: #ebccd1; -} -.alert-danger hr { - border-top-color: #e4b9c0; -} -.alert-danger .alert-link { - color: #843534; -} -@-webkit-keyframes progress-bar-stripes { - from { - background-position: 40px 0; - } - to { - background-position: 0 0; - } -} -@keyframes progress-bar-stripes { - from { - background-position: 40px 0; - } - to { - background-position: 0 0; - } -} -.progress { - height: 20px; - margin-bottom: 20px; - overflow: hidden; - background-color: #f5f5f5; - border-radius: 4px; - -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, .1); - box-shadow: inset 0 1px 2px rgba(0, 0, 0, .1); -} -.progress-bar { - float: left; - width: 0; - height: 100%; - font-size: 12px; - line-height: 20px; - color: #fff; - text-align: center; - background-color: #428bca; - -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, .15); - box-shadow: inset 0 -1px 0 rgba(0, 0, 0, .15); - -webkit-transition: width .6s ease; - transition: width .6s ease; -} -.progress-striped .progress-bar { - background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent); - background-image: linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent); - background-size: 40px 40px; -} -.progress.active .progress-bar { - -webkit-animation: progress-bar-stripes 2s linear infinite; - animation: progress-bar-stripes 2s linear infinite; -} -.progress-bar-success { - background-color: #5cb85c; -} -.progress-striped .progress-bar-success { - background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent); - background-image: linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent); -} -.progress-bar-info { - background-color: #5bc0de; -} -.progress-striped .progress-bar-info { - background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent); - background-image: linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent); -} -.progress-bar-warning { - background-color: #f0ad4e; -} -.progress-striped .progress-bar-warning { - background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent); - background-image: linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent); -} -.progress-bar-danger { - background-color: #d9534f; -} -.progress-striped .progress-bar-danger { - background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent); - background-image: linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent); -} -.media, -.media-body { - overflow: hidden; - zoom: 1; -} -.media, -.media .media { - margin-top: 15px; -} -.media:first-child { - margin-top: 0; -} -.media-object { - display: block; -} -.media-heading { - margin: 0 0 5px; -} -.media > .pull-left { - margin-right: 10px; -} -.media > .pull-right { - margin-left: 10px; -} -.media-list { - padding-left: 0; - list-style: none; -} -.list-group { - padding-left: 0; - margin-bottom: 20px; -} -.list-group-item { - position: relative; - display: block; - padding: 10px 15px; - margin-bottom: -1px; - background-color: #fff; - border: 1px solid #ddd; -} -.list-group-item:first-child { - border-top-left-radius: 4px; - border-top-right-radius: 4px; -} -.list-group-item:last-child { - margin-bottom: 0; - border-bottom-right-radius: 4px; - border-bottom-left-radius: 4px; -} -.list-group-item > .badge { - float: right; -} -.list-group-item > .badge + .badge { - margin-right: 5px; -} -a.list-group-item { - color: #555; -} -a.list-group-item .list-group-item-heading { - color: #333; -} -a.list-group-item:hover, -a.list-group-item:focus { - text-decoration: none; - background-color: #f5f5f5; -} -a.list-group-item.active, -a.list-group-item.active:hover, -a.list-group-item.active:focus { - z-index: 2; - color: #fff; - background-color: #428bca; - border-color: #428bca; -} -a.list-group-item.active .list-group-item-heading, -a.list-group-item.active:hover .list-group-item-heading, -a.list-group-item.active:focus .list-group-item-heading { - color: inherit; -} -a.list-group-item.active .list-group-item-text, -a.list-group-item.active:hover .list-group-item-text, -a.list-group-item.active:focus .list-group-item-text { - color: #e1edf7; -} -.list-group-item-success { - color: #3c763d; - background-color: #dff0d8; -} -a.list-group-item-success { - color: #3c763d; -} -a.list-group-item-success .list-group-item-heading { - color: inherit; -} -a.list-group-item-success:hover, -a.list-group-item-success:focus { - color: #3c763d; - background-color: #d0e9c6; -} -a.list-group-item-success.active, -a.list-group-item-success.active:hover, -a.list-group-item-success.active:focus { - color: #fff; - background-color: #3c763d; - border-color: #3c763d; -} -.list-group-item-info { - color: #31708f; - background-color: #d9edf7; -} -a.list-group-item-info { - color: #31708f; -} -a.list-group-item-info .list-group-item-heading { - color: inherit; -} -a.list-group-item-info:hover, -a.list-group-item-info:focus { - color: #31708f; - background-color: #c4e3f3; -} -a.list-group-item-info.active, -a.list-group-item-info.active:hover, -a.list-group-item-info.active:focus { - color: #fff; - background-color: #31708f; - border-color: #31708f; -} -.list-group-item-warning { - color: #8a6d3b; - background-color: #fcf8e3; -} -a.list-group-item-warning { - color: #8a6d3b; -} -a.list-group-item-warning .list-group-item-heading { - color: inherit; -} -a.list-group-item-warning:hover, -a.list-group-item-warning:focus { - color: #8a6d3b; - background-color: #faf2cc; -} -a.list-group-item-warning.active, -a.list-group-item-warning.active:hover, -a.list-group-item-warning.active:focus { - color: #fff; - background-color: #8a6d3b; - border-color: #8a6d3b; -} -.list-group-item-danger { - color: #a94442; - background-color: #f2dede; -} -a.list-group-item-danger { - color: #a94442; -} -a.list-group-item-danger .list-group-item-heading { - color: inherit; -} -a.list-group-item-danger:hover, -a.list-group-item-danger:focus { - color: #a94442; - background-color: #ebcccc; -} -a.list-group-item-danger.active, -a.list-group-item-danger.active:hover, -a.list-group-item-danger.active:focus { - color: #fff; - background-color: #a94442; - border-color: #a94442; -} -.list-group-item-heading { - margin-top: 0; - margin-bottom: 5px; -} -.list-group-item-text { - margin-bottom: 0; - line-height: 1.3; -} -.panel { - margin-bottom: 20px; - background-color: #fff; - border: 1px solid transparent; - border-radius: 4px; - -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, .05); - box-shadow: 0 1px 1px rgba(0, 0, 0, .05); -} -.panel-body { - padding: 15px; -} -.panel > .list-group { - margin-bottom: 0; -} -.panel > .list-group .list-group-item { - border-width: 1px 0; - border-radius: 0; -} -.panel > .list-group .list-group-item:first-child { - border-top: 0; -} -.panel > .list-group .list-group-item:last-child { - border-bottom: 0; -} -.panel > .list-group:first-child .list-group-item:first-child { - border-top-left-radius: 3px; - border-top-right-radius: 3px; -} -.panel > .list-group:last-child .list-group-item:last-child { - border-bottom-right-radius: 3px; - border-bottom-left-radius: 3px; -} -.panel-heading + .list-group .list-group-item:first-child { - border-top-width: 0; -} -.panel > .table, -.panel > .table-responsive > .table { - margin-bottom: 0; -} -.panel > .table:first-child > thead:first-child > tr:first-child td:first-child, -.panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child td:first-child, -.panel > .table:first-child > tbody:first-child > tr:first-child td:first-child, -.panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child td:first-child, -.panel > .table:first-child > thead:first-child > tr:first-child th:first-child, -.panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child th:first-child, -.panel > .table:first-child > tbody:first-child > tr:first-child th:first-child, -.panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child th:first-child { - border-top-left-radius: 3px; -} -.panel > .table:first-child > thead:first-child > tr:first-child td:last-child, -.panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child td:last-child, -.panel > .table:first-child > tbody:first-child > tr:first-child td:last-child, -.panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child td:last-child, -.panel > .table:first-child > thead:first-child > tr:first-child th:last-child, -.panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child th:last-child, -.panel > .table:first-child > tbody:first-child > tr:first-child th:last-child, -.panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child th:last-child { - border-top-right-radius: 3px; -} -.panel > .table:last-child > tbody:last-child > tr:last-child td:first-child, -.panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child td:first-child, -.panel > .table:last-child > tfoot:last-child > tr:last-child td:first-child, -.panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child td:first-child, -.panel > .table:last-child > tbody:last-child > tr:last-child th:first-child, -.panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child th:first-child, -.panel > .table:last-child > tfoot:last-child > tr:last-child th:first-child, -.panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child th:first-child { - border-bottom-left-radius: 3px; -} -.panel > .table:last-child > tbody:last-child > tr:last-child td:last-child, -.panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child td:last-child, -.panel > .table:last-child > tfoot:last-child > tr:last-child td:last-child, -.panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child td:last-child, -.panel > .table:last-child > tbody:last-child > tr:last-child th:last-child, -.panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child th:last-child, -.panel > .table:last-child > tfoot:last-child > tr:last-child th:last-child, -.panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child th:last-child { - border-bottom-right-radius: 3px; -} -.panel > .panel-body + .table, -.panel > .panel-body + .table-responsive { - border-top: 1px solid #ddd; -} -.panel > .table > tbody:first-child > tr:first-child th, -.panel > .table > tbody:first-child > tr:first-child td { - border-top: 0; -} -.panel > .table-bordered, -.panel > .table-responsive > .table-bordered { - border: 0; -} -.panel > .table-bordered > thead > tr > th:first-child, -.panel > .table-responsive > .table-bordered > thead > tr > th:first-child, -.panel > .table-bordered > tbody > tr > th:first-child, -.panel > .table-responsive > .table-bordered > tbody > tr > th:first-child, -.panel > .table-bordered > tfoot > tr > th:first-child, -.panel > .table-responsive > .table-bordered > tfoot > tr > th:first-child, -.panel > .table-bordered > thead > tr > td:first-child, -.panel > .table-responsive > .table-bordered > thead > tr > td:first-child, -.panel > .table-bordered > tbody > tr > td:first-child, -.panel > .table-responsive > .table-bordered > tbody > tr > td:first-child, -.panel > .table-bordered > tfoot > tr > td:first-child, -.panel > .table-responsive > .table-bordered > tfoot > tr > td:first-child { - border-left: 0; -} -.panel > .table-bordered > thead > tr > th:last-child, -.panel > .table-responsive > .table-bordered > thead > tr > th:last-child, -.panel > .table-bordered > tbody > tr > th:last-child, -.panel > .table-responsive > .table-bordered > tbody > tr > th:last-child, -.panel > .table-bordered > tfoot > tr > th:last-child, -.panel > .table-responsive > .table-bordered > tfoot > tr > th:last-child, -.panel > .table-bordered > thead > tr > td:last-child, -.panel > .table-responsive > .table-bordered > thead > tr > td:last-child, -.panel > .table-bordered > tbody > tr > td:last-child, -.panel > .table-responsive > .table-bordered > tbody > tr > td:last-child, -.panel > .table-bordered > tfoot > tr > td:last-child, -.panel > .table-responsive > .table-bordered > tfoot > tr > td:last-child { - border-right: 0; -} -.panel > .table-bordered > thead > tr:first-child > th, -.panel > .table-responsive > .table-bordered > thead > tr:first-child > th, -.panel > .table-bordered > tbody > tr:first-child > th, -.panel > .table-responsive > .table-bordered > tbody > tr:first-child > th, -.panel > .table-bordered > tfoot > tr:first-child > th, -.panel > .table-responsive > .table-bordered > tfoot > tr:first-child > th, -.panel > .table-bordered > thead > tr:first-child > td, -.panel > .table-responsive > .table-bordered > thead > tr:first-child > td, -.panel > .table-bordered > tbody > tr:first-child > td, -.panel > .table-responsive > .table-bordered > tbody > tr:first-child > td, -.panel > .table-bordered > tfoot > tr:first-child > td, -.panel > .table-responsive > .table-bordered > tfoot > tr:first-child > td { - border-top: 0; -} -.panel > .table-bordered > thead > tr:last-child > th, -.panel > .table-responsive > .table-bordered > thead > tr:last-child > th, -.panel > .table-bordered > tbody > tr:last-child > th, -.panel > .table-responsive > .table-bordered > tbody > tr:last-child > th, -.panel > .table-bordered > tfoot > tr:last-child > th, -.panel > .table-responsive > .table-bordered > tfoot > tr:last-child > th, -.panel > .table-bordered > thead > tr:last-child > td, -.panel > .table-responsive > .table-bordered > thead > tr:last-child > td, -.panel > .table-bordered > tbody > tr:last-child > td, -.panel > .table-responsive > .table-bordered > tbody > tr:last-child > td, -.panel > .table-bordered > tfoot > tr:last-child > td, -.panel > .table-responsive > .table-bordered > tfoot > tr:last-child > td { - border-bottom: 0; -} -.panel > .table-responsive { - margin-bottom: 0; - border: 0; -} -.panel-heading { - padding: 10px 15px; - border-bottom: 1px solid transparent; - border-top-left-radius: 3px; - border-top-right-radius: 3px; -} -.panel-heading > .dropdown .dropdown-toggle { - color: inherit; -} -.panel-title { - margin-top: 0; - margin-bottom: 0; - font-size: 16px; - color: inherit; -} -.panel-title > a { - color: inherit; -} -.panel-footer { - padding: 10px 15px; - background-color: #f5f5f5; - border-top: 1px solid #ddd; - border-bottom-right-radius: 3px; - border-bottom-left-radius: 3px; -} -.panel-group { - margin-bottom: 20px; -} -.panel-group .panel { - margin-bottom: 0; - overflow: hidden; - border-radius: 4px; -} -.panel-group .panel + .panel { - margin-top: 5px; -} -.panel-group .panel-heading { - border-bottom: 0; -} -.panel-group .panel-heading + .panel-collapse .panel-body { - border-top: 1px solid #ddd; -} -.panel-group .panel-footer { - border-top: 0; -} -.panel-group .panel-footer + .panel-collapse .panel-body { - border-bottom: 1px solid #ddd; -} -.panel-default { - border-color: #ddd; -} -.panel-default > .panel-heading { - color: #333; - background-color: #f5f5f5; - border-color: #ddd; -} -.panel-default > .panel-heading + .panel-collapse .panel-body { - border-top-color: #ddd; -} -.panel-default > .panel-footer + .panel-collapse .panel-body { - border-bottom-color: #ddd; -} -.panel-primary { - border-color: #428bca; -} -.panel-primary > .panel-heading { - color: #fff; - background-color: #428bca; - border-color: #428bca; -} -.panel-primary > .panel-heading + .panel-collapse .panel-body { - border-top-color: #428bca; -} -.panel-primary > .panel-footer + .panel-collapse .panel-body { - border-bottom-color: #428bca; -} -.panel-success { - border-color: #d6e9c6; -} -.panel-success > .panel-heading { - color: #3c763d; - background-color: #dff0d8; - border-color: #d6e9c6; -} -.panel-success > .panel-heading + .panel-collapse .panel-body { - border-top-color: #d6e9c6; -} -.panel-success > .panel-footer + .panel-collapse .panel-body { - border-bottom-color: #d6e9c6; -} -.panel-info { - border-color: #bce8f1; -} -.panel-info > .panel-heading { - color: #31708f; - background-color: #d9edf7; - border-color: #bce8f1; -} -.panel-info > .panel-heading + .panel-collapse .panel-body { - border-top-color: #bce8f1; -} -.panel-info > .panel-footer + .panel-collapse .panel-body { - border-bottom-color: #bce8f1; -} -.panel-warning { - border-color: #faebcc; -} -.panel-warning > .panel-heading { - color: #8a6d3b; - background-color: #fcf8e3; - border-color: #faebcc; -} -.panel-warning > .panel-heading + .panel-collapse .panel-body { - border-top-color: #faebcc; -} -.panel-warning > .panel-footer + .panel-collapse .panel-body { - border-bottom-color: #faebcc; -} -.panel-danger { - border-color: #ebccd1; -} -.panel-danger > .panel-heading { - color: #a94442; - background-color: #f2dede; - border-color: #ebccd1; -} -.panel-danger > .panel-heading + .panel-collapse .panel-body { - border-top-color: #ebccd1; -} -.panel-danger > .panel-footer + .panel-collapse .panel-body { - border-bottom-color: #ebccd1; -} -.well { - min-height: 20px; - padding: 19px; - margin-bottom: 20px; - background-color: #f5f5f5; - border: 1px solid #e3e3e3; - border-radius: 4px; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .05); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, .05); -} -.well blockquote { - border-color: #ddd; - border-color: rgba(0, 0, 0, .15); -} -.well-lg { - padding: 24px; - border-radius: 6px; -} -.well-sm { - padding: 9px; - border-radius: 3px; -} -.close { - float: right; - font-size: 21px; - font-weight: bold; - line-height: 1; - color: #000; - text-shadow: 0 1px 0 #fff; - filter: alpha(opacity=20); - opacity: .2; -} -.close:hover, -.close:focus { - color: #000; - text-decoration: none; - cursor: pointer; - filter: alpha(opacity=50); - opacity: .5; -} -button.close { - -webkit-appearance: none; - padding: 0; - cursor: pointer; - background: transparent; - border: 0; -} -.modal-open { - overflow: hidden; -} -.modal { - position: fixed; - top: 0; - right: 0; - bottom: 0; - left: 0; - z-index: 1050; - display: none; - overflow: auto; - overflow-y: scroll; - -webkit-overflow-scrolling: touch; - outline: 0; -} -.modal.fade .modal-dialog { - -webkit-transition: -webkit-transform .3s ease-out; - -moz-transition: -moz-transform .3s ease-out; - -o-transition: -o-transform .3s ease-out; - transition: transform .3s ease-out; - -webkit-transform: translate(0, -25%); - -ms-transform: translate(0, -25%); - transform: translate(0, -25%); -} -.modal.in .modal-dialog { - -webkit-transform: translate(0, 0); - -ms-transform: translate(0, 0); - transform: translate(0, 0); -} -.modal-dialog { - position: relative; - width: auto; - margin: 10px; -} -.modal-content { - position: relative; - background-color: #fff; - background-clip: padding-box; - border: 1px solid #3676ab; - border: 1px solid rgba(0, 0, 0, .2); - border-radius: 6px; - outline: none; - -webkit-box-shadow: 0 3px 9px rgba(0, 0, 0, .5); - box-shadow: 0 3px 9px rgba(0, 0, 0, .5); -} -.modal-backdrop { - position: fixed; - top: 0; - right: 0; - bottom: 0; - left: 0; - z-index: 1040; - background-color: #000; -} -.modal-backdrop.fade { - filter: alpha(opacity=0); - opacity: 0; -} -.modal-backdrop.in { - filter: alpha(opacity=50); - opacity: .5; -} -.modal-header { - min-height: 16.428571429px; - padding: 15px; - border-bottom: 1px solid #e5e5e5; -} -.modal-header .close { - margin-top: -2px; -} -.modal-title { - margin: 0; - line-height: 1.428571429; -} -.modal-body { - position: relative; - padding: 20px; -} -.modal-footer { - padding: 19px 20px 20px; - margin-top: 15px; - text-align: right; - border-top: 1px solid #e5e5e5; -} -.modal-footer .btn + .btn { - margin-bottom: 0; - margin-left: 5px; -} -.modal-footer .btn-group .btn + .btn { - margin-left: -1px; -} -.modal-footer .btn-block + .btn-block { - margin-left: 0; -} -@media (min-width: 768px) { - .modal-dialog { - width: 600px; - margin: 30px auto; - } - .modal-content { - -webkit-box-shadow: 0 5px 15px rgba(0, 0, 0, .5); - box-shadow: 0 5px 15px rgba(0, 0, 0, .5); - } - .modal-sm { - width: 300px; - } - .modal-lg { - width: 900px; - } -} -.tooltip { - position: absolute; - z-index: 1030; - display: block; - font-size: 12px; - line-height: 1.4; - visibility: visible; - filter: alpha(opacity=0); - opacity: 0; -} -.tooltip.in { - filter: alpha(opacity=90); - opacity: .9; -} -.tooltip.top { - padding: 5px 0; - margin-top: -3px; -} -.tooltip.right { - padding: 0 5px; - margin-left: 3px; -} -.tooltip.bottom { - padding: 5px 0; - margin-top: 3px; -} -.tooltip.left { - padding: 0 5px; - margin-left: -3px; -} -.tooltip-inner { - max-width: 200px; - padding: 3px 8px; - color: #fff; - text-align: center; - text-decoration: none; - background-color: #000; - border-radius: 4px; -} -.tooltip-arrow { - position: absolute; - width: 0; - height: 0; - border-color: transparent; - border-style: solid; -} -.tooltip.top .tooltip-arrow { - bottom: 0; - left: 50%; - margin-left: -5px; - border-width: 5px 5px 0; - border-top-color: #000; -} -.tooltip.top-left .tooltip-arrow { - bottom: 0; - left: 5px; - border-width: 5px 5px 0; - border-top-color: #000; -} -.tooltip.top-right .tooltip-arrow { - right: 5px; - bottom: 0; - border-width: 5px 5px 0; - border-top-color: #000; -} -.tooltip.right .tooltip-arrow { - top: 50%; - left: 0; - margin-top: -5px; - border-width: 5px 5px 5px 0; - border-right-color: #000; -} -.tooltip.left .tooltip-arrow { - top: 50%; - right: 0; - margin-top: -5px; - border-width: 5px 0 5px 5px; - border-left-color: #000; -} -.tooltip.bottom .tooltip-arrow { - top: 0; - left: 50%; - margin-left: -5px; - border-width: 0 5px 5px; - border-bottom-color: #000; -} -.tooltip.bottom-left .tooltip-arrow { - top: 0; - left: 5px; - border-width: 0 5px 5px; - border-bottom-color: #000; -} -.tooltip.bottom-right .tooltip-arrow { - top: 0; - right: 5px; - border-width: 0 5px 5px; - border-bottom-color: #000; -} -.popover { - position: absolute; - top: 0; - left: 0; - z-index: 1010; - display: none; - max-width: 276px; - padding: 1px; - text-align: left; - white-space: normal; - background-color: #fff; - background-clip: padding-box; - border: 1px solid #ccc; - border: 1px solid rgba(0, 0, 0, .2); - border-radius: 6px; - -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, .2); - box-shadow: 0 5px 10px rgba(0, 0, 0, .2); -} -.popover.top { - margin-top: -10px; -} -.popover.right { - margin-left: 10px; -} -.popover.bottom { - margin-top: 10px; -} -.popover.left { - margin-left: -10px; -} -.popover-title { - padding: 8px 14px; - margin: 0; - font-size: 14px; - font-weight: normal; - line-height: 18px; - background-color: #f7f7f7; - border-bottom: 1px solid #ebebeb; - border-radius: 5px 5px 0 0; -} -.popover-content { - padding: 9px 14px; -} -.popover .arrow, -.popover .arrow:after { - position: absolute; - display: block; - width: 0; - height: 0; - border-color: transparent; - border-style: solid; -} -.popover .arrow { - border-width: 11px; -} -.popover .arrow:after { - content: ""; - border-width: 10px; -} -.popover.top .arrow { - bottom: -11px; - left: 50%; - margin-left: -11px; - border-top-color: #3676ab; - border-top-color: rgba(0, 0, 0, .25); - border-bottom-width: 0; -} -.popover.top .arrow:after { - bottom: 1px; - margin-left: -10px; - content: " "; - border-top-color: #fff; - border-bottom-width: 0; -} -.popover.right .arrow { - top: 50%; - left: -11px; - margin-top: -11px; - border-right-color: #3676ab; - border-right-color: rgba(0, 0, 0, .25); - border-left-width: 0; -} -.popover.right .arrow:after { - bottom: -10px; - left: 1px; - content: " "; - border-right-color: #fff; - border-left-width: 0; -} -.popover.bottom .arrow { - top: -11px; - left: 50%; - margin-left: -11px; - border-top-width: 0; - border-bottom-color: #3676ab; - border-bottom-color: rgba(0, 0, 0, .25); -} -.popover.bottom .arrow:after { - top: 1px; - margin-left: -10px; - content: " "; - border-top-width: 0; - border-bottom-color: #fff; -} -.popover.left .arrow { - top: 50%; - right: -11px; - margin-top: -11px; - border-right-width: 0; - border-left-color: #3676ab; - border-left-color: rgba(0, 0, 0, .25); -} -.popover.left .arrow:after { - right: 1px; - bottom: -10px; - content: " "; - border-right-width: 0; - border-left-color: #fff; -} -.carousel { - position: relative; -} -.carousel-inner { - position: relative; - width: 100%; - overflow: hidden; -} -.carousel-inner > .item { - position: relative; - display: none; - -webkit-transition: .6s ease-in-out left; - transition: .6s ease-in-out left; -} -.carousel-inner > .item > img, -.carousel-inner > .item > a > img { - display: block; - max-width: 100%; - height: auto; - line-height: 1; -} -.carousel-inner > .active, -.carousel-inner > .next, -.carousel-inner > .prev { - display: block; -} -.carousel-inner > .active { - left: 0; -} -.carousel-inner > .next, -.carousel-inner > .prev { - position: absolute; - top: 0; - width: 100%; -} -.carousel-inner > .next { - left: 100%; -} -.carousel-inner > .prev { - left: -100%; -} -.carousel-inner > .next.left, -.carousel-inner > .prev.right { - left: 0; -} -.carousel-inner > .active.left { - left: -100%; -} -.carousel-inner > .active.right { - left: 100%; -} -.carousel-control { - position: absolute; - top: 0; - bottom: 0; - left: 0; - width: 15%; - font-size: 20px; - color: #fff; - text-align: center; - text-shadow: 0 1px 2px rgba(0, 0, 0, .6); - filter: alpha(opacity=50); - opacity: .5; -} -.carousel-control.left { - background-image: -webkit-linear-gradient(left, color-stop(rgba(0, 0, 0, .5) 0%), color-stop(rgba(0, 0, 0, .0001) 100%)); - background-image: linear-gradient(to right, rgba(0, 0, 0, .5) 0%, rgba(0, 0, 0, .0001) 100%); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#80000000', endColorstr='#00000000', GradientType=1); - background-repeat: repeat-x; -} -.carousel-control.right { - right: 0; - left: auto; - background-image: -webkit-linear-gradient(left, color-stop(rgba(0, 0, 0, .0001) 0%), color-stop(rgba(0, 0, 0, .5) 100%)); - background-image: linear-gradient(to right, rgba(0, 0, 0, .0001) 0%, rgba(0, 0, 0, .5) 100%); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#80000000', GradientType=1); - background-repeat: repeat-x; -} -.carousel-control:hover, -.carousel-control:focus { - color: #fff; - text-decoration: none; - filter: alpha(opacity=90); - outline: none; - opacity: .9; -} -.carousel-control .icon-prev, -.carousel-control .icon-next, -.carousel-control .glyphicon-chevron-left, -.carousel-control .glyphicon-chevron-right { - position: absolute; - top: 50%; - z-index: 5; - display: inline-block; -} -.carousel-control .icon-prev, -.carousel-control .glyphicon-chevron-left { - left: 50%; -} -.carousel-control .icon-next, -.carousel-control .glyphicon-chevron-right { - right: 50%; -} -.carousel-control .icon-prev, -.carousel-control .icon-next { - width: 20px; - height: 20px; - margin-top: -10px; - margin-left: -10px; - font-family: serif; -} -.carousel-control .icon-prev:before { - content: '\2039'; -} -.carousel-control .icon-next:before { - content: '\203a'; -} -.carousel-indicators { - position: absolute; - bottom: 10px; - left: 50%; - z-index: 15; - width: 60%; - padding-left: 0; - margin-left: -30%; - text-align: center; - list-style: none; -} -.carousel-indicators li { - display: inline-block; - width: 10px; - height: 10px; - margin: 1px; - text-indent: -3676abpx; - cursor: pointer; - background-color: #000 \9; - background-color: rgba(0, 0, 0, 0); - border: 1px solid #fff; - border-radius: 10px; -} -.carousel-indicators .active { - width: 12px; - height: 12px; - margin: 0; - background-color: #fff; -} -.carousel-caption { - position: absolute; - right: 15%; - bottom: 20px; - left: 15%; - z-index: 10; - padding-top: 20px; - padding-bottom: 20px; - color: #fff; - text-align: center; - text-shadow: 0 1px 2px rgba(0, 0, 0, .6); -} -.carousel-caption .btn { - text-shadow: none; -} -@media screen and (min-width: 768px) { - .carousel-control .glyphicons-chevron-left, - .carousel-control .glyphicons-chevron-right, - .carousel-control .icon-prev, - .carousel-control .icon-next { - width: 30px; - height: 30px; - margin-top: -15px; - margin-left: -15px; - font-size: 30px; - } - .carousel-caption { - right: 20%; - left: 20%; - padding-bottom: 30px; - } - .carousel-indicators { - bottom: 20px; - } -} -.clearfix:before, -.clearfix:after, -.container:before, -.container:after, -.container-fluid:before, -.container-fluid:after, -.row:before, -.row:after, -.form-horizontal .form-group:before, -.form-horizontal .form-group:after, -.btn-toolbar:before, -.btn-toolbar:after, -.btn-group-vertical > .btn-group:before, -.btn-group-vertical > .btn-group:after, -.nav:before, -.nav:after, -.navbar:before, -.navbar:after, -.navbar-header:before, -.navbar-header:after, -.navbar-collapse:before, -.navbar-collapse:after, -.pager:before, -.pager:after, -.panel-body:before, -.panel-body:after, -.modal-footer:before, -.modal-footer:after { - display: table; - content: " "; -} -.clearfix:after, -.container:after, -.container-fluid:after, -.row:after, -.form-horizontal .form-group:after, -.btn-toolbar:after, -.btn-group-vertical > .btn-group:after, -.nav:after, -.navbar:after, -.navbar-header:after, -.navbar-collapse:after, -.pager:after, -.panel-body:after, -.modal-footer:after { - clear: both; -} -.center-block { - display: block; - margin-right: auto; - margin-left: auto; -} -.pull-right { - float: right !important; -} -.pull-left { - float: left !important; -} -.hide { - display: none !important; -} -.show { - display: block !important; -} -.invisible { - visibility: hidden; -} -.text-hide { - font: 0/0 a; - color: transparent; - text-shadow: none; - background-color: transparent; - border: 0; -} -.hidden { - display: none !important; - visibility: hidden !important; -} -.affix { - position: fixed; -} -@-ms-viewport { - width: device-width; -} -.visible-xs, -tr.visible-xs, -th.visible-xs, -td.visible-xs { - display: none !important; -} -@media (max-width: 767px) { - .visible-xs { - display: block !important; - } - table.visible-xs { - display: table; - } - tr.visible-xs { - display: table-row !important; - } - th.visible-xs, - td.visible-xs { - display: table-cell !important; - } -} -.visible-sm, -tr.visible-sm, -th.visible-sm, -td.visible-sm { - display: none !important; -} -@media (min-width: 768px) and (max-width: 991px) { - .visible-sm { - display: block !important; - } - table.visible-sm { - display: table; - } - tr.visible-sm { - display: table-row !important; - } - th.visible-sm, - td.visible-sm { - display: table-cell !important; - } -} -.visible-md, -tr.visible-md, -th.visible-md, -td.visible-md { - display: none !important; -} -@media (min-width: 992px) and (max-width: 1199px) { - .visible-md { - display: block !important; - } - table.visible-md { - display: table; - } - tr.visible-md { - display: table-row !important; - } - th.visible-md, - td.visible-md { - display: table-cell !important; - } -} -.visible-lg, -tr.visible-lg, -th.visible-lg, -td.visible-lg { - display: none !important; -} -@media (min-width: 1200px) { - .visible-lg { - display: block !important; - } - table.visible-lg { - display: table; - } - tr.visible-lg { - display: table-row !important; - } - th.visible-lg, - td.visible-lg { - display: table-cell !important; - } -} -@media (max-width: 767px) { - .hidden-xs, - tr.hidden-xs, - th.hidden-xs, - td.hidden-xs { - display: none !important; - } -} -@media (min-width: 768px) and (max-width: 991px) { - .hidden-sm, - tr.hidden-sm, - th.hidden-sm, - td.hidden-sm { - display: none !important; - } -} -@media (min-width: 992px) and (max-width: 1199px) { - .hidden-md, - tr.hidden-md, - th.hidden-md, - td.hidden-md { - display: none !important; - } -} -@media (min-width: 1200px) { - .hidden-lg, - tr.hidden-lg, - th.hidden-lg, - td.hidden-lg { - display: none !important; - } -} -.visible-print, -tr.visible-print, -th.visible-print, -td.visible-print { - display: none !important; -} -@media print { - .visible-print { - display: block !important; - } - table.visible-print { - display: table; - } - tr.visible-print { - display: table-row !important; - } - th.visible-print, - td.visible-print { - display: table-cell !important; - } -} -@media print { - .hidden-print, - tr.hidden-print, - th.hidden-print, - td.hidden-print { - display: none !important; - } -} + + /*# sourceMappingURL=bootstrap.css.map */ #my_form input{ - width: 400px; + width: 300px; } #my_form a{ @@ -5118,4 +1853,7 @@ td.visible-print { } #my_form button { float: left; -}
\ No newline at end of file +} +#my_form <p>{ + text-align: left; + } diff --git a/website/static/css/main.css b/website/static/css/main.css index 2c0ef97..24ee442 100644 --- a/website/static/css/main.css +++ b/website/static/css/main.css @@ -1645,14 +1645,17 @@ /* Type */ body { + /*background: url(../img/3.png) no-repeat center top;*/ + background-color: #935d8c; color: rgba(255, 255, 255, 0.65); } body, input, select, textarea { - font-family: "Source Sans Pro", Helvetica, sans-serif; + font-family: Helvetica, sans-serif; + /*font-family: "Source Sans Pro", Helvetica, sans-serif;*/ font-size: 17pt; - font-weight: 500; + font-weight: 300; line-height: 1.65; } @@ -1686,8 +1689,8 @@ -ms-transition: color 0.2s ease, border-bottom 0.2s ease; transition: color 0.2s ease, border-bottom 0.2s ease; text-decoration: none; - border-bottom: dotted 1px; - color: inherit; +/* border-bottom: dotted 1px; +*/ color: blue; } a:hover { @@ -1836,7 +1839,8 @@ } strong, b { - color: #ffffff; + color: #595656; + font-weight: 600; } h1, h2, h3, h4, h5, h6 { @@ -1986,26 +1990,17 @@ button, .button { background-color: transparent; - /*box-shadow: inset 0 0 0 .51px black;*/ - color: white !important; - font-weight: 500; - background-color: #D44727 - - } - -.button1 { - - background-color: transparent; box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.35); color: #ffffff !important; } - /* input[type="submit"]:hover, + + input[type="submit"]:hover, input[type="reset"]:hover, input[type="button"]:hover, button:hover, .button:hover { background-color: rgba(255, 255, 255, 0.075); - }*/ + } input[type="submit"]:active, input[type="reset"]:active, @@ -2028,9 +2023,10 @@ input[type="button"].special, button.special, .button.special { - background-color: #8cc9f0; + background-color: #D44727; color: #ffffff !important; box-shadow: none; + font-weight: 500; } input[type="submit"].special:hover, @@ -2038,7 +2034,7 @@ input[type="button"].special:hover, button.special:hover, .button.special:hover { - background-color: #9acff2; + background-color: #333; } input[type="submit"].special:active, @@ -2839,9 +2835,9 @@ } .features li { - width: calc(33.33333% - 2em); + width: 20%; margin-left: 2em; - margin-top: 3em; + padding: 0; } @@ -2906,6 +2902,7 @@ padding: 1.5em; color: #ffffff; text-align: center; + font-weight: bold; } .statistics li.style1 { @@ -3087,6 +3084,21 @@ } /* Header */ +#header1 { + /*background-size: 1500px 750px;*/ + padding: 5em 5em 1em 5em ; + text-align: center; + } + + #header1 h1 { + margin: 0 0 0.25em 0; + color: #ffffff; + font-weight: bold; + } + #header1 h2 { + margin: 0 0 0.25em 0; + color: #ffffff; + } #header { background: url(../img/3.png) no-repeat center top; @@ -3097,24 +3109,17 @@ #header h1 { margin: 0 0 0.25em 0; - color: black; - font-weight: 400; - } - #header h2 { - - color: black; - + color: #484848; + font-weight: bold; } #header p { font-size: 1.25em; letter-spacing: -0.025em; - color: black; - font-weight: bold; } #header.alt { - padding: 7em 5em 4em 5em ; + padding: 5em 5em 4em 5em ; } #header.alt h1 { @@ -3150,6 +3155,7 @@ display: block; margin: 0 auto; max-width: 75%; + width: 14%; } @media screen and (max-width: 1280px) { @@ -3244,12 +3250,12 @@ -ms-transition: background-color 0.2s ease, border-top-left-radius 0.2s ease, border-top-right-radius 0.2s ease, padding 0.2s ease; transition: background-color 0.2s ease, border-top-left-radius 0.2s ease, border-top-right-radius 0.2s ease, padding 0.2s ease; background-color: #ffffff; - color: white; + color: #fff; position: absolute; width: 64em; max-width: calc(100% - 4em); padding: 1em; - background-color: #f7f7f7; + background-color: #333; border-top-left-radius: 0.25em; border-top-right-radius: 0.25em; cursor: default; @@ -3321,11 +3327,11 @@ } #nav ul li a:hover { - background-color: #BEBEBE; + background-color: rgba(222, 222, 222, 0.25); } #nav ul li a.active { - background-color: #D44727; + background-color: #656464; box-shadow: none; } @@ -3333,7 +3339,7 @@ position: fixed; top: 0; padding: 0.5em 1em; - background-color: black; + background-color:#333; border-top-left-radius: 0; border-top-right-radius: 0; z-index: 10000; @@ -3457,7 +3463,7 @@ #main input[type="button"].special:active, #main button.special:active, #main .button.special:active { - background-color: #7ec3ee; + background-color: #000; } #main input[type="submit"].special.icon:before, diff --git a/website/templates/abstract-details.html b/website/templates/abstract-details.html index 30a6dea..319feb2 100644 --- a/website/templates/abstract-details.html +++ b/website/templates/abstract-details.html @@ -17,7 +17,7 @@ {% block header %} - <header id="header"> + <header id="header1"> <h1>Scipy India 2016</h1> <h2>Abstract Details</h2> </header> @@ -27,21 +27,28 @@ <div id="wrapper"> {% block nav %} - - <nav id="nav" class="alt"> - <ul> - <li><a href="{% url 'website:home' %}" class="active">Scip India 2016</a></li> - - {% if user and not user.is_anonymous %} +<div id="wrapper"> +<div id="navbar-main"> + <!-- Fixed navbar --> + <div class="navbar navbar-inverse navbar-fixed-top"> + <div class="navbar-collapse collapse"> + <ul class="nav navbar-nav"> + <li><a href="{% url 'website:home' %}" class="active">Home</a></li> + {% if user and not user.is_anonymous %} <li class="dropdown"> - <a href="#" class="dropdown-toggle" data-toggle="dropdown">{{ user.get_full_name|default:user.username }}<b class="caret"></b></a> + <a href="#" class="dropdown-toggle" data-toggle="dropdown">{{ user.get_full_name|default:user.username }}</a> <ul class="dropdown-menu"> <li><a href="{% url 'auth:logout' %}?next=/2016/cfp">Logout</a></li> <li><a href="{% url 'website:cfp' %}">Main Menu</a></li> - </ul> + </ul> + {% else %} + <li><a href="{% url 'website:cfp' %}" >Login</a></li> {% endif %} - </ul> - </nav> + </ul> + </div> + <!--/.nav-collapse --> + </div> +</div> {% endblock %} @@ -56,10 +63,12 @@ {% if proposal.prerequisite %} <p><b>Prerequisite: </b> {{ proposal.prerequisite }}</p> {% endif%} + <p><b>Date Created: </b> {{ proposal.date_created }}</p> {% if proposal.attachment.url %} - <a href="{{ proposal.attachment.url }}" class="btn btn-info" target="_blank">Attachment</a> + <p><b>Attachment: </b> + <a href="{{ proposal.attachment.url }}" class="btn btn-info" target="_blank">{{proposal.attachment}}</a></p> {% endif %} - <p><b>Date Created: </b> {{ proposal.date_created }}</p> + <hr> <h4>Comments</h4> <hr> diff --git a/website/templates/base.html b/website/templates/base.html index 4855a50..2197957 100644 --- a/website/templates/base.html +++ b/website/templates/base.html @@ -9,8 +9,8 @@ <script src="{% static 'js/ie/html5shiv.js' %}"></script>
<link rel="stylesheet" href="{% static 'css/main.css'%}" />
<link rel="stylesheet" href="{% static 'css/fileuploader.css'%}" />
- <link rel="stylesheet" href="{% static 'css/ie9.css' %}" />
- <link rel="stylesheet" href="{% static 'css/ie8.css' %}" />
+ <!-- <link rel="stylesheet" href="{% static 'css/ie9.css' %}" /> -->
+ <!-- <link rel="stylesheet" href="{% static 'css/ie8.css' %}" /> -->
<link href="{% static 'css/base.css' %}" rel="stylesheet">
<link href="{% static 'css/font-awesome.min.css' %}" rel="stylesheet">
</head>
@@ -23,63 +23,52 @@ <header id="header" class="alt">
<span class="logo"><img src="{% static 'img/logo.png' %}" alt="" /></span>
<h1 >Scipy India 2016</h1>
- <p >DECEMBER 9, 10 & 11</p><br><br>
- <cente
- <table class="table" style="border-spacing: 40px 10px;">
-
- <tr>
-
- <td>
- <a href="{% url 'website:cfp' %}" class="button" style="width : 220px;" >Attend</a>
- </td>
- <!-- <td> </td> -->
- <td>
- <a href="#callforabstract" class="button" style="width : 220px;">Submit Abstract</a>
- </td>
- <!-- <td> </td> -->
- <td>
- <a href="#callforabstract" class="button" style="width : 220px;" >Propose Workshop</a>
- </td>
-
- </tr>
- </table>
- </center>
+ <p style="color:#636363; font-weight:500" >DECEMBER 9, 10 & 11</p><br><br>
+
+ <a href="{% url 'website:cfp' %}" class="button special" style="width : 220px;" >Attend</a></center>
+ <a href="#callforabstract" class="button special" style="width : 220px;">Submit Abstract</a></center>
+ <a href="#callforabstract" class="button special" style="width : 220px;" >Propose Workshop</a></center>
</header>
{% endblock %}
+
+<body data-spy="scroll" data-offset="0" data-target="#navbar-main">
+
{% block nav %}
- <nav id="nav" class="alt">
- <ul>
- <li><a href="{% url 'website:home' %}" class="active">Home</a></li>
- <li><a href="#about" >About</a></li>
- <li><a href="#speakers" >Speakers</a></li>
- <li><a href="#attend" >Attend</a></li>
- <li><a href="#schedule" >Schedule</a></li>
- <li><a href="#venue">Venue</a></li>
- <li><a href="#callforabstract">Call for Proposal</a></li>
- <li><a href="#sponsors" >Sponsors</a></li>
- <li><a href="#contact" >Contact</a></li>
-
-
-
-
- {% if user and not user.is_anonymous %}
+<div id="navbar-main">
+ <!-- Fixed navbar -->
+ <div class="navbar navbar-inverse navbar-fixed-top">
+ <div class="navbar-collapse collapse">
+ <ul class="nav navbar-nav">
+ <li> <a href="#" class="smoothScroll">Home</a></li>
+ <li> <a href="#about" class="smoothScroll">About</a></li>
+ <li> <a href="#speakers" class="smoothScroll">Speakers</a></li>
+ <li> <a href="#attend" class="smoothScroll">Attend</a></li>
+ <li> <a href="#callforabstract">Call for Proposal</a></li>
+ <li> <a href="#schedule" class="smoothScroll">Schedule</a></li>
+ <li> <a href="#venue" class="smoothScroll">Venue</a></li>
+ <li> <a href="#sponsors" class="smoothScroll">Sponsors</a></li>
+ <li> <a href="#contact" class="smoothScroll">Contact</a></li>
+ {% if user and not user.is_anonymous %}
<li class="dropdown">
- <a href="#" class="dropdown-toggle" data-toggle="dropdown">{{ user.get_full_name|default:user.username }}<b class="caret"></b></a>
+ <a href="#" class="dropdown-toggle" data-toggle="dropdown">{{ user.get_full_name|default:user.username }}</a>
<ul class="dropdown-menu">
<li><a href="{% url 'auth:logout' %}?next=/2016/cfp">Logout</a></li>
+ <li><a href="{% url 'website:cfp' %}">Main Menu</a></li>
</ul>
- {% else %} <li><a href="{% url 'website:cfp' %}" >Login</a></li>
+ {% else %}
+ <li><a href="{% url 'website:cfp' %}" >Login</a></li>
{% endif %}
-
-
-
- </ul>
- </nav>
+ </ul>
+ </div>
+ <!--/.nav-collapse -->
+ </div>
+</div>
{% endblock %}
+
<!-- Main -->
{% block content %}
<div id="main">
@@ -91,9 +80,33 @@ <header class="major">
<h2>ABOUT</h2>
</header>
- <p>We look forward to your proposals. Conference aims to promote Python for Scientific Computing and Education. Topics like pedagogy, exploration, modeling or from both applied and developmental perspectives are welcome. Contributions from academia as well as industry are welcome. If you wish to propose a talk at the conference, kindly follow the guidelines given below.</p>
+ <p style= "font-size: 20px;">We look forward to your proposals. Conference aims to promote Python for Scientific Computing and Education. Topics like pedagogy, exploration, modeling or from both applied and developmental perspectives are welcome. Contributions from academia as well as industry are welcome. If you wish to propose a talk at the conference, kindly follow the guidelines given below.</p>
</div>
+ </div>
+ <div><h3>SciPy India Conferences down the lane</h3>
+ <ul class="features">
+ <li>
+ <span><img src="{% static 'img/s15.jpg' %}" width="200" alt="" /></span>
+ <h4><a href="http://scipy.in/2015" target="_blank">SciPy India 2015</a></h4>
+
+ </li>
+ <li>
+ <span><img src="{% static 'img/s14.jpg' %}" width="200" alt="" /></span>
+ <h4><a href="http://scipy.in/2014" target="_blank">SciPy India 2014</a></h4>
+
+ </li>
+ <li>
+ <span><img src="{% static 'img/s13.jpg' %}" width="200" alt="" /></span>
+ <h4><a href="http://scipy.in/2013" target="_blank">SciPy India 2013</a></h4>
+
+ </li>
+ <li>
+ <span><img src="{% static 'img/s12.jpg' %}" width="200" alt="" /></span>
+ <h4><a href="http://scipy.in/2012" target="_blank">SciPy India 2012</a></h4>
+
+ </li>
+ </ul>
</div>
</section>
@@ -105,67 +118,31 @@ <header class="major">
<h2>SPEAKERS</h2>
-
+ <center>
- <div id="carousel-example-generic" class="carousel slide" data-ride="carousel">
- <!-- Wrapper for slides -->
- <div class="carousel-inner">
- <div class="item active centered">
- <table class="tile_table">
- <tr>
- <td>
- <img class="img-responsive" src="{% static 'img/c1.png' %}" alt="">
- </td>
- <td>
- <p>Dr. Ajith Kumar</p>
- Information about the person. His topic or anythhin related to. Filed of work etc.
- <p></p>
+ <div class = "col-md-4">
+ <img class="img-responsive" src="{% static 'img/pic01.png' %}" alt="">
+ <p>Dr. Abc Xyz</p>
<a href="https://github.com/expeyes" targer"_blank"><i class="icon-github" style="font-size:30px;"></i></a>
<a href="http://expeyes.in/" target="_blank"><i class="icon-info" style="font-size:30px;"></i></a>
+ </div>
+ <div class = "col-md-4">
+ <img class="img-responsive" src="{% static 'img/pic01.png' %}" alt="">
+ <p>Dr. Abc Xyz</p>
+ <a href="https://github.com/expeyes" targer"_blank"><i class="icon-github" style="font-size:30px;"></i></a>
+
+ <a href="http://expeyes.in/" target="_blank"><i class="icon-info" style="font-size:30px;"></i></a>
+ </div>
+ <div class = "col-md-4">
+ <img class="img-responsive" src="{% static 'img/pic01.png' %}" alt="">
+ <p>Dr. Abc Xyz</p>
+ <a href="https://github.com/expeyes" targer"_blank"><i class="icon-github" style="font-size:30px;"></i></a>
+
+ <a href="http://expeyes.in/" target="_blank"><i class="icon-info" style="font-size:30px;"></i></a>
+ </div>
+ </center>
- </td>
- </tr>
- </table>
-
- </div>
- <div class="item centered">
- <table class="tile_table">
- <tr>
- <td>
- <img class="img-responsive" src="{% static 'img/c2.png' %}" alt="">
- </td>
- <td>
- <p>PQR UVW</p>
- <hr>
- Information about the person. His topic or anythhin related to talk. Filed of work etc.
-
- </td>
- </tr>
- </table>
- </div>
- <div class="item centered">
- <table class="tile_table">
- <tr>
- <td>
- <img class="img-responsive" src="{% static 'img/c3.png' %}" alt="">
- </td>
- <td>
- <p>ABC XYZ</p>
- <hr>
- Information about the person. His topic or anythhin related to talk. Filed of work etc.
-
- </td>
- </tr>
- </table>
- </div>
- </div>
- <ol class="carousel-indicators">
- <li data-target="#carousel-example-generic" data-slide-to="0" class="active"></li>
- <li data-target="#carousel-example-generic" data-slide-to="1"></li>
- <li data-target="#carousel-example-generic" data-slide-to="2"></li>
- </ol>
- </div>
</div>
</div>
@@ -176,43 +153,115 @@ <section id="attend" class="main special">
<header class="major">
<h2>ATTEND</h2>
- </header>
- <ul class="statistics">
- <a onmouseover="getElementById('demo').innerHTML= 'This ticket includes conference (tutorials + talks), lunch and snacks for 3 days. It does not include Accommodation & T-Shirt. This is a non-refundable ticket.'">
- <li class="style1">
- <p>Early Bird</p>
- <strong>₹1000</strong>Till 14 Nov</a>
- </li>
- <a onmouseover="getElementById('demo').innerHTML= 'This Ticket allows you to ONLY attend the conference for 3 Days. Does not include any conference amenities (Accommodation, Kit, Food & T-shirt). This is a non-refundable ticket.'">
- <li class="style2">
- <p>Light</p>
- <strong>₹300</strong>Till 14 Nov</a>
- </li>
- <a onmouseover="getElementById('demo').innerHTML= 'This ticket includes conference (tutorials + talks), lunch and snacks for 3 days. It does not include Accommodation & T-Shirt. This is a non-refundable ticket.'">
- <li class="style3">
- <p>Regular</p>
- <strong>₹1200</strong>Till 14 Nov</a>
- </li>
- <a onmouseover="getElementById('demo').innerHTML= 'Change of size, exchange at the venue is not available. This is a non-refundable ticket.'">
- <li class="style4">
- <p>T-shirt</p>
- <strong>₹250</strong> </a>
- </li>
- <a onmouseover="getElementById('demo').innerHTML= 'Accommodation is provided on a shared basis (twin sharing) inside IIT-B campus (Boys/Girls hostel). Accommodation will be provided for 3 days, i.e, 13-14, 14-15 and 15-16 December. Accommodation does not include other amenities like dinner, etc. Extension of period of stay is not available. This is a non-refundable ticket.'">
- <li class="style5">
- <p>Accomodation</p>
- <strong>₹750</strong> </a>
- </li>
- </ul>
+ </header>
+
+ <table >
+ <colgroup>
+ <col width="20%" />
+ <col width="60%" />
+
+ </colgroup>
+ <tr>
+ <center>
+ <!-- <ul class="statistics"> -->
+ <td bgcolor="#efa8b0">
+ <!-- <ul class="statistics"> -->
+ <!-- <li class="style1"> -->
+ <h9 style="color:white;">Early Bird</h9>
+ <h2 style="color:white;" style ="font-size: 25px;">₹1000</h2>
+ <!-- </ul> -->
+ </td>
+ <td>
+ This ticket includes conference (tutorials + talks), lunch and snacks for 3 days. It does not include Accommodation & T-Shirt. This is a non-refundable ticket.
+ </td>
+ </tr>
+ <tr>
+ <td bgcolor = "#c79cc8">
+ <!-- <ul class="statistics"> -->
+ <!-- <li class="style2"> -->
+
+ <h9 style="color:white;">Light</h9>
+ <h2 style="color:white;"style ="font-size: 25px;">₹300</h2>
+ <!-- </li> -->
+ <!-- </ul> -->
+ </td>
+ <td>
+ This Ticket allows you to ONLY attend the conference for 3 Days. Does not include any conference amenities (Accommodation, Kit, Food & T-shirt). This is a non-refundable ticket. </td>
+ </tr>
+ <tr>
+ <td bgcolor="#a89cc8">
+ <!-- <ul class="statistics"> -->
+ <!-- <li class="style3"> -->
+ <h9 style="color:white;">Regular</h9>
+ <h2 style="color:white;" style ="font-size: 25px;">₹1200</h2>
+ <!-- </li> -->
+ <!-- </ul> -->
+ </td>
+ <td>
+ This ticket includes conference (tutorials + talks), lunch and snacks for 3 days. It does not include Accommodation & T-Shirt. This is a non-refundable ticket.</td>
+ </tr>
+ <tr>
+ <td bgcolor ="#9bb2e1">
+ <!-- <ul class="statistics"> -->
+ <!-- <li class="style5"> -->
+ <h9 style="color:white;">Accomodation</h9>
+ <h2 style="color:white;" style ="font-size: 25px;">₹750</h2>
+ <!-- </li> -->
+ <!-- </ul> -->
+ </td>
+ <td>
+ Accommodation is provided on a shared basis (twin sharing) inside IIT-B campus (Boys/Girls hostel). Accommodation will be provided for 3 days, i.e, 13-14, 14-15 and 15-16 December. Accommodation does not include other amenities like dinner, etc. Extension of period of stay is not available. This is a non-refundable ticket.
+ </td>
+ <tr>
+ <td bgcolor= "#8cc9f0">
+ <!-- <ul class="statistics"> -->
+ <!-- <li class="style4"> -->
+ <h9 style="color:white;">T-Shirt</h9>
+ <h2 style="color:white;" style ="font-size: 25px;">₹250</h2>
+ <!-- </li> -->
+ <!-- </ul> -->
+ </td>
+ <td>
+ Change of size, exchange at the venue is not available. This is a non-refundable ticket.
+ </td>
+ </tr>
+ </tr>
+
+ </table>
<p id="demo"></p>
<footer class="major">
<ul class="actions">
- <li><a href="#" class="button">Register</a></li>
+ <li><input type= "image" href="#" style="height:40px;width:180px;" src="{% static 'img/register.png'%}"></li>
</ul>
</footer>
</section>
+
+<section id="callforabstract" class="main special">
+ <div class="spotlight">
+ <div class="content">
+ <header class="major">
+ <h2>CALL FOR PROPOSAL</h2></header>
+ <div class="col-md-6">
+ <p align="justify">We look forward to your proposals. Conference aims to promote <strong>Python for Scientific Computing and Education</strong>. Topics like pedagogy, exploration, modeling or from both applied and developmental perspectives are welcome. Contributions from academia as well as industry are welcome. If you wish to propose a talk at the conference, kindly follow the guidelines given below.</p><br><br>
+ {% if user and not user.is_anonymous and not login_required %}
+ <a class="button" href="{% url 'website:submitcfp' %}">Submit Abstract</a>
+ {% else %}
+ <a class="button" href="{% url 'website:cfp' %}">Submit Abstract</a>
+ {% endif %}
+ </div>
+ <div class="col-md-6">
+ <p align="justify">We look forward to your proposals. Conference aims to promote <strong>Python for Scientific Computing and Education</strong>. Topics like pedagogy, exploration, modeling or from both applied and developmental perspectives are welcome. Contributions from academia as well as industry are welcome. If you wish to propose a talk at the conference, kindly follow the guidelines given below.</p><br><br>
+ {% if user and not user.is_anonymous and not login_required %}
+ <a class="button" href="{% url 'website:submitcfw' %}">Propose Workshop</a>
+ {% else %}
+ <a class="button" href="{% url 'website:cfp' %}">Propose Workshop</a>
+ {% endif %}
+
+ </div>
+ </section>
+
<section id="schedule" class="main special">
@@ -225,14 +274,17 @@ <div >
<center>
<ul class="nav nav-tabs">
- <li class="active"><a data-toggle="tab" href="http://scipy.in/2015#day1">Day 1</a></li>
- <li><a data-toggle="tab" href="http://scipy.in/2015#day2">Day 2</a></li>
- <li><a data-toggle="tab" href="http://scipy.in/2015#day3">Day 3</a></li>
- <li><a data-toggle="tab" href="http://scipy.in/2015#paper">Workshop Resources</a></li> <li><a data-toggle="tab" href="http://scipy.in/2015#workshop">Workshop Instructions</a></li>
+ <li class="active">
+ <a style="background: #efa8b0;" data-toggle="tab" href="http://scipy.in/2015#day1">Day 1</a></li>
+ <li><a style="background: #c79cc8;" data-toggle="tab" href="http://scipy.in/2015#day2">Day 2</a></li>
+ <li><a style="background: #a89cc8;" data-toggle="tab" href="http://scipy.in/2015#day3">Day 3</a></li>
+ <li><a style="background: #9bb2e1;"data-toggle="tab" href="http://scipy.in/2015#paper">Workshop Resources</a></li>
+ <li><a style="background: #8cc9f0;" data-toggle="tab" href="http://scipy.in/2015#workshop">Workshop Instructions</a></li>
</ul>
<div class="tab-content">
+
<div id="day1" class="tab-pane fade in active">
<p>
</p><center><h4>14 Dec 2015: Day 1</h4></center>
@@ -379,31 +431,7 @@ - <section id="callforabstract" class="main special">
- <div class="spotlight">
- <div class="content">
- <header class="major">
- <h2>CALL FOR PROPOSAL</h2></header>
- <div class="col-md-6">
- <p align="justify">We look forward to your proposals. Conference aims to promote <strong>Python for Scientific Computing and Education</strong>. Topics like pedagogy, exploration, modeling or from both applied and developmental perspectives are welcome. Contributions from academia as well as industry are welcome. If you wish to propose a talk at the conference, kindly follow the guidelines given below.</p><br><br>
- {% if user and not user.is_anonymous and not login_required %}
- <a class="button" href="{% url 'website:submitcfp' %}">Submit Abstract</a>
- {% else %}
- <a class="button" href="{% url 'website:cfp' %}">Submit Abstract</a>
- {% endif %}
- </div>
- <div class="col-md-6">
- <p align="justify">We look forward to your proposals. Conference aims to promote <strong>Python for Scientific Computing and Education</strong>. Topics like pedagogy, exploration, modeling or from both applied and developmental perspectives are welcome. Contributions from academia as well as industry are welcome. If you wish to propose a talk at the conference, kindly follow the guidelines given below.</p><br><br>
- {% if user and not user.is_anonymous and not login_required %}
- <a class="button" href="{% url 'website:submitcfw' %}">Propose Workshop</a>
- {% else %}
- <a class="button" href="{% url 'website:cfp' %}">Propose Workshop</a>
- {% endif %}
-
- </div>
- </section>
-
-
+
<section id="sponsors" class="main special">
<div class="spotlight">
<div class="content">
@@ -423,50 +451,50 @@ <p align="justify">The Annual SciPy India conference is organised by the team members of FOSSEE project which is part of the National Mission on Education through ICT with the thrust area being Adaptation and deployment of open source simulation packages equivalent to proprietary software, funded by MHRD, based at the Indian Institute of Technology Bombay (IITB).</p>
</div>
</section>
+<!--
+
+
--><br><br><br>
</div>
- <section id="contact" name="contact"></section>
- <div class="container">
-
- <header >
- <br>
- <h2>CONTACT US</h2>
- <br>
- <div class="col-lg-8 col-lg-offset-2 centered"> <i class="icon-envelope" style="font-size:20px;"> scipy[at]fossee[dot]in</i>
- </div>
- <div class="col-lg-8 col-lg-offset-2 centered">
- <br>
- <p>Feel free to send us an email if you have any questions.</p>
- <form id="contact" action="" class="form" role="form" method=POST enctype="multipart/form-data">
- <div class="row">
- <div class="col-xs-6 col-md-6 form-group">
- <input class="form-control" id="name" name="name" placeholder="Name" type="text" required />
- </div>
- <div class="col-xs-6 col-md-6 form-group">
- <input class="form-control" id="email" name="email" placeholder="Email" type="email" required />
- </div>
- </div>
- <br>
- <textarea class="form-control" id="message" name="message" placeholder="Message" rows="5"></textarea>
- <div class="row">
- <div class="col-xs-12 col-md-12">
- <br>
- <button class="button1" type="submit">Send Message</button>
- <br><br>
- <ul class="social-button">
- <a href="https://www.facebook.com/scipydotin"><i class="icon-facebook" style="font-size:30px;"></i></a>
- <a href="https://twitter.com/scipyindia"><i class="icon-twitter" style="font-size:30px;"></i></a>
- <a href="#"><i class="icon-google-plus" style="font-size:30px;"></i></a>
- </ul><br><br>
- </div>
- </div>
- {% csrf_token %}
- </form>
- <!-- form -->
- </div>
- </div>
+ <footer id="footer">
+ <section id="contact">
+ <h2>Write Us</h2>
+ <p>Feel free to send us an email if you have any questions.</p>
+ <form id="contact" action="" class="form" role="form" method=POST enctype="multipart/form-data">{% csrf_token %}
+ <div class="col-md-6 form-group">
+ <input class="form-control" id="name" name="name" placeholder="Name" type="text" required />
+ </div>
+ <div class="col-md-6 form-group">
+ <input class="form-control" id="email" name="email" placeholder="Email" type="email" required />
+ </div>
+ <br><br>
+ <textarea class="form-control" id="message" name="message" placeholder="Message" rows="5"></textarea>
+ <br>
+ <button class="button" type="submit">Send Message</button>
+ </section>
+ <section>
+ <h2>Contact Us</h2>
+ <dl class="alt">
+ <dt>Address</dt>
+ <dd>1234 Somewhere Road • Nashville, TN 00000 • USA</dd>
+ <dt>Phone</dt>
+ <dd>(000) 000-0000 x 0000</dd>
+ <dt>Email</dt>
+ <dd><a href="#">information@untitled.tld</a></dd>
+ </dl>
+ <ul class="icons">
+ <li><a href="#" class="icon fa-twitter alt"><span class="label">Twitter</span></a></li>
+ <li><a href="#" class="icon fa-facebook alt"><span class="label">Facebook</span></a></li>
+ <li><a href="#" class="icon fa-instagram alt"><span class="label">Instagram</span></a></li>
+ <li><a href="#" class="icon fa-github alt"><span class="label">GitHub</span></a></li>
+ <li><a href="#" class="icon fa-dribbble alt"><span class="label">Dribbble</span></a></li>
+ </ul>
+ </section>
+ </footer>
+
</div>
+
</div>
<!-- end wrapper -->
{% endblock %}
@@ -479,8 +507,9 @@ <script src="{% static 'js/jquery.scrollex.min.js' %}"></script>
<script src="{% static 'js/jquery.scrolly.min.js' %}"></script>
<script src="{% static 'js/skel.min.js' %}"></script>
- <script src="{% static '/js/ie/respond.min.js' %}"></script>
+ <script src="{% static 'js/ie/respond.min.js' %}"></script>
<script src="{% static 'js/bootstrap.min.js' %}"></script>
+ <script src="{% static 'js/smoothscroll.js' %}"></script>
</body>
</html>
\ No newline at end of file diff --git a/website/templates/cfp.html b/website/templates/cfp.html index ec5bf0c..594f86b 100644 --- a/website/templates/cfp.html +++ b/website/templates/cfp.html @@ -3,22 +3,22 @@ <!DOCTYPE HTML> <html> - <head> - <title>Call for Proposal</title> - <meta charset="utf-8" /> - <meta name="viewport" content="width=device-width, initial-scale=1" /> - <!--[if lte IE 8]><script src="assets/js/ie/html5shiv.js"></script><![endif]--> - <link rel="stylesheet" href="assets/css/main.css" /> - <!--[if lte IE 9]><link rel="stylesheet" href="assets/css/ie9.css" /><![endif]--> - <!--[if lte IE 8]><link rel="stylesheet" href="assets/css/ie8.css" /><![endif]--> - </head> - <body> + <head> + <title>Call for Proposal</title> + <meta charset="utf-8" /> + <meta name="viewport" content="width=device-width, initial-scale=1" /> + <!--[if lte IE 8]><script src="assets/js/ie/html5shiv.js"></script><![endif]--> + <link rel="stylesheet" href="assets/css/main.css" /> + <!--[if lte IE 9]><link rel="stylesheet" href="assets/css/ie9.css" /><![endif]--> + <!--[if lte IE 8]><link rel="stylesheet" href="assets/css/ie8.css" /><![endif]--> + </head> + <body> {% block header %} - <header id="header"> - <h1>Scipy India 2016</h1> - <h2>Call For Proposal</h2> + <header id="header1"> + <h1>Scipy India 2016</h1> + <h2>Call For Proposal</h2> </header> {% endblock %} @@ -26,26 +26,34 @@ {% block nav %} - <nav id="nav" class="alt"> - <ul> - <li><a href="{% url 'website:home' %}" class="active">Scip India 2016</a></li> - - {% if user and not user.is_anonymous %} +<div id="navbar-main"> + <!-- Fixed navbar --> + <div class="navbar navbar-inverse navbar-fixed-top"> + <div class="navbar-collapse collapse"> + <ul class="nav navbar-nav"> + <li><a href="{% url 'website:home' %}" class="active">Home</a></li> + {% if user and not user.is_anonymous %} <li class="dropdown"> - <a href="#" class="dropdown-toggle" data-toggle="dropdown">{{ user.get_full_name|default:user.username }}<b class="caret"></b></a> + <a href="#" class="dropdown-toggle" data-toggle="dropdown">{{ user.get_full_name|default:user.username }}</a> <ul class="dropdown-menu"> <li><a href="{% url 'auth:logout' %}?next=/2016/cfp">Logout</a></li> - - </ul> + <li><a href="{% url 'website:cfp' %}">Main Menu</a></li> + </ul> + {% else %} + <li><a href="{% url 'website:cfp' %}" >Login</a></li> {% endif %} - </ul> - </nav> + </ul> + </div> + <!--/.nav-collapse --> + </div> +</div> {% endblock %} -{% block content %} - <div id="wrapper"> -<div id="main"> +{% block content %} + <div id="wrapper"> +<div id="main" class="col-md-5"> + <section id="content" class="main"> {% if user and not user.is_anonymous and not login_required %} <h2><u>Main Menu</u></h2> @@ -74,14 +82,18 @@ </form> </div> <br> - {% endif %} - - + {% endif %} + + + </section> - <!-- Main --> - - - <h2><u>Proposal Guidelines</u></h2> + </div> + <div id="wrapper" > +<div id="main" class="col-md-7" > + +<section id="content" class="main"> + + <h2><u>Proposal Guidelines</u></h2> <ul> <li>The project you are willing to present should be an actual implementation rather than just an idea. <li>Abstract should be of 300 to 700 words describing the topic, including its relevance to scientific computing. @@ -90,26 +102,25 @@ <li>Notification for selection/rejection of your proposal will be given through email. <li>All selected proposals must be presented at the conference by at least one author. </ul> - <h2><u>Important Dates</u></h2> - <ul> + <h2><u>Important Dates</u></h2> + <ul> <li>CFP Open: July 5, 2015 <li>CFP Close: November 24, 2015 <li>Announcement of selected proposals: December 1, 2015 </ul> - </section> - - </div> + </section> + </div> {% endblock %} - - <!-- Scripts --> - <script src="assets/js/jquery.min.js"></script> - <script src="assets/js/jquery.scrollex.min.js"></script> - <script src="assets/js/jquery.scrolly.min.js"></script> - <script src="assets/js/skel.min.js"></script> - <script src="assets/js/util.js"></script> - <!--[if lte IE 8]><script src="assets/js/ie/respond.min.js"></script><![endif]--> - <script src="assets/js/main.js"></script> + + <!-- Scripts --> + <script src="assets/js/jquery.min.js"></script> + <script src="assets/js/jquery.scrollex.min.js"></script> + <script src="assets/js/jquery.scrolly.min.js"></script> + <script src="assets/js/skel.min.js"></script> + <script src="assets/js/util.js"></script> + <!--[if lte IE 8]><script src="assets/js/ie/respond.min.js"></script><![endif]--> + <script src="assets/js/main.js"></script> - </body> + </body> </html>
\ No newline at end of file diff --git a/website/templates/comment-abstract.html b/website/templates/comment-abstract.html index 92d9e9b..42b66d2 100644 --- a/website/templates/comment-abstract.html +++ b/website/templates/comment-abstract.html @@ -16,31 +16,35 @@ {% block header %} - <header id="header"> + <header id="header1"> <h1>Scipy India 2016</h1> - <h2>Comment Abstract</h2> + <h2>Abstract Details</h2> </header> {% endblock %} - - -<div id="wrapper"> {% block nav %} - - <nav id="nav" class="alt"> - <ul> - <li><a href="{% url 'website:home' %}" class="active">Scip India 2016</a></li> - - {% if user and not user.is_anonymous %} +<div id="wrapper"> +<div id="navbar-main"> + <!-- Fixed navbar --> + <div class="navbar navbar-inverse navbar-fixed-top"> + <div class="navbar-collapse collapse"> + <ul class="nav navbar-nav"> + <li><a href="{% url 'website:home' %}" class="active">Home</a></li> + {% if user and not user.is_anonymous %} <li class="dropdown"> - <a href="#" class="dropdown-toggle" data-toggle="dropdown">{{ user.get_full_name|default:user.username }}<b class="caret"></b></a> + <a href="#" class="dropdown-toggle" data-toggle="dropdown">{{ user.get_full_name|default:user.username }}</a> <ul class="dropdown-menu"> <li><a href="{% url 'auth:logout' %}?next=/2016/cfp">Logout</a></li> - <li><a href="{% url 'website:cfp' %}">Call For Proposal</a></li> - </ul> + <li><a href="{% url 'website:cfp' %}">Main Menu</a></li> + </ul> + {% else %} + <li><a href="{% url 'website:cfp' %}" >Login</a></li> {% endif %} - </ul> - </nav> + </ul> + </div> + <!--/.nav-collapse --> + </div> +</div> {% endblock %} @@ -58,25 +62,31 @@ {% if proposal.attachment.url %} <a href="{{ proposal.attachment.url }}" class="btn btn-info" target="_blank">Attachment</a> {% endif %} - <p><b>Date Created: </b> {{ proposal.date_created }}</p> + <p><b>Date Created: </b> {{ proposal.date_created }}</p> + <hr> + <form action="{% url 'website:status' proposal.id %}" method='POST'>{% csrf_token %} + + <input type="submit" value="Accept" name="accept"/> + <input type="submit" value="Reject" name="reject"/> + + </form> <hr> <h4>Comments</h4> - <h4>Comments</h4> - <hr> {% for comment in comments %} <div> <strong>Comment By:</strong> {{ comment.user.first_name }} {{ comment.user.last_name }} - <p>{{ comment.comment|safe }}</p> + <p>{{ comment.comment|safe }}</p> + <!-- <a href="#">Edit</a> + <a href="#">Delete</a> --> </div> <hr> {% endfor %} <form action="{% url 'website:comment_abstract' proposal.id %}" method='POST' enctype="multipart/form-data"> {% csrf_token %} - <textarea rows="5" cols="100" name="comment"></textarea><br> - <button type="submit" class="btn btn-info"> - Comment - </button> + <textarea rows="5" cols="100" id="comment" class= "comment" name="comment" placeholder = "Add commnet here..."></textarea><br> + <button type="submit" class="button">Comment</button> + </form> </section> @@ -93,5 +103,30 @@ <!--[if lte IE 8]><script src="assets/js/ie/respond.min.js"></script><![endif]--> <script src="assets/js/main.js"></script> - </body> + +<script> +isFormHtml5Valid(form) { + for(var el of form.querySelectorAll('input,textarea,select')){ + if(!el.checkValidity()) + return false; + } + return true; +} + +mySubmitButton.onclick = function() { + if(this.form && isFormHtml5Valid(this.form)) + this.disabled=true; + this.form.submit(); +}</script> + + + +<script> +$(function(){ + +} +) +</script> + +</body> </html>
\ No newline at end of file diff --git a/website/templates/submit-cfp.html b/website/templates/submit-cfp.html index 00ab9ae..ac77975 100755 --- a/website/templates/submit-cfp.html +++ b/website/templates/submit-cfp.html @@ -18,29 +18,36 @@ {% block header %} - <header id="header"> + <header id="header1"> <h1>Scipy India 2016</h1> - <h2 style= "color:black;">Submit Abstract</h2> + <h2>Submit Abstract</h2> </header> {% endblock %} <div id="wrapper"> {% block nav %} - <nav id="nav" class="alt"> - <ul> - <li><a href="{% url 'website:home' %}" class="active">Scip India 2016</a></li> - - {% if user and not user.is_anonymous %} + <div id="navbar-main"> + <!-- Fixed navbar --> + <div class="navbar navbar-inverse navbar-fixed-top"> + <div class="navbar-collapse collapse"> + <ul class="nav navbar-nav"> + <li><a href="{% url 'website:home' %}" class="active">Home</a></li> + {% if user and not user.is_anonymous %} <li class="dropdown"> - <a href="#" class="dropdown-toggle" data-toggle="dropdown">{{ user.get_full_name|default:user.username }}<b class="caret"></b></a> + <a href="#" class="dropdown-toggle" data-toggle="dropdown">{{ user.get_full_name|default:user.username }}</a> <ul class="dropdown-menu"> <li><a href="{% url 'auth:logout' %}?next=/2016/cfp">Logout</a></li> <li><a href="{% url 'website:cfp' %}">Main Menu</a></li> - </ul> + </ul> + {% else %} + <li><a href="{% url 'website:cfp' %}" >Login</a></li> {% endif %} - </ul> - </nav> + </ul> + </div> + <!--/.nav-collapse --> + </div> +</div> {% endblock %} diff --git a/website/templates/submit-cfw.html b/website/templates/submit-cfw.html index b0413b8..f43b378 100644 --- a/website/templates/submit-cfw.html +++ b/website/templates/submit-cfw.html @@ -18,29 +18,36 @@ {% block header %} - <header id="header"> + <header id="header1"> <h1>Scipy India 2016</h1> - <h2 style= "color:black;">Submit Workshop Proposal</h2> + <h2>Submit Workshop Proposal</h2> </header> {% endblock %} <div id="wrapper"> {% block nav %} - <nav id="nav" class="alt"> - <ul> - <li><a href="{% url 'website:home' %}" class="active">Scip India 2016</a></li> - - {% if user and not user.is_anonymous %} +<div id="navbar-main"> + <!-- Fixed navbar --> + <div class="navbar navbar-inverse navbar-fixed-top"> + <div class="navbar-collapse collapse"> + <ul class="nav navbar-nav"> + <li><a href="{% url 'website:home' %}" class="active">Home</a></li> + {% if user and not user.is_anonymous %} <li class="dropdown"> - <a href="#" class="dropdown-toggle" data-toggle="dropdown">{{ user.get_full_name|default:user.username }}<b class="caret"></b></a> + <a href="#" class="dropdown-toggle" data-toggle="dropdown">{{ user.get_full_name|default:user.username }}</a> <ul class="dropdown-menu"> <li><a href="{% url 'auth:logout' %}?next=/2016/cfp">Logout</a></li> <li><a href="{% url 'website:cfp' %}">Main Menu</a></li> - </ul> + </ul> + {% else %} + <li><a href="{% url 'website:cfp' %}" >Login</a></li> {% endif %} - </ul> - </nav> + </ul> + </div> + <!--/.nav-collapse --> + </div> +</div> {% endblock %} diff --git a/website/templates/user-register.html b/website/templates/user-register.html index cecaa33..dfeba84 100644 --- a/website/templates/user-register.html +++ b/website/templates/user-register.html @@ -18,29 +18,26 @@ {% block header %} - <header id="header"> + <header id="header1"> <h1>Scipy India 2016</h1> - <h2 style= "color:black;">Register</h2> + <h2>Register</h2> </header> {% endblock %} <div id="wrapper"> {% block nav %} - <nav id="nav" class="alt"> - <ul> - <li><a href="{% url 'website:home' %}" class="active">Scip India 2016</a></li> - - {% if user and not user.is_anonymous %} - <li class="dropdown"> - <a href="#" class="dropdown-toggle" data-toggle="dropdown">{{ user.get_full_name|default:user.username }}<b class="caret"></b></a> - <ul class="dropdown-menu"> - <li><a href="{% url 'auth:logout' %}?next=/2016/cfp">Logout</a></li> - <li><a href="{% url 'website:cfp' %}">Call For Proposal</a></li> - </ul> - {% endif %} +<div id="navbar-main"> + <!-- Fixed navbar --> + <div class="navbar navbar-inverse navbar-fixed-top"> + <div class="navbar-collapse collapse"> + <ul class="nav navbar-nav"> + <li><a href="{% url 'website:home' %}" class="active">Home</a></li> </ul> - </nav> + </div> + <!--/.nav-collapse --> + </div> +</div> {% endblock %} @@ -63,11 +60,14 @@ <p style="line-height:5px;"><a href="{% url 'website:forgotpassword' %}">Click Here</a> if you forgot your username or password</p> </center> {% endif %} + {% if registration_complete %} + <p> Your Account is Created Successfully !</p> + {% endif %} <div> <form action="" method="POST"> - {{ form.as_p }} + {{ form.as_p}} <div class="col-md-8"> - <button class="button" type="submit">SignUp</button> + <button class="button" type="submit" >SignUp</button> <a class="btn btn-primary" href="{% url 'website:cfp' %}">I have an account</a> </div> {% csrf_token %} diff --git a/website/templates/view-abstracts.html b/website/templates/view-abstracts.html index a48f2e0..0df72e7 100644 --- a/website/templates/view-abstracts.html +++ b/website/templates/view-abstracts.html @@ -19,29 +19,36 @@ {% block header %} - <header id="header"> + <header id="header1"> <h1>Scipy India 2016</h1> - <h2 style= "color:black;">View Proposals</h2> + <h2>View Proposals</h2> </header> {% endblock %} <div id="wrapper"> {% block nav %} - <nav id="nav" class="alt"> - <ul> - <li><a href="{% url 'website:home' %}" class="active">Scip India 2016</a></li> - - {% if user and not user.is_anonymous %} + <div id="navbar-main"> + <!-- Fixed navbar --> + <div class="navbar navbar-inverse navbar-fixed-top"> + <div class="navbar-collapse collapse"> + <ul class="nav navbar-nav"> + <li><a href="{% url 'website:home' %}" class="active">Home</a></li> + {% if user and not user.is_anonymous %} <li class="dropdown"> - <a href="#" class="dropdown-toggle" data-toggle="dropdown">{{ user.get_full_name|default:user.username }}<b class="caret"></b></a> + <a href="#" class="dropdown-toggle" data-toggle="dropdown">{{ user.get_full_name|default:user.username }}</a> <ul class="dropdown-menu"> <li><a href="{% url 'auth:logout' %}?next=/2016/cfp">Logout</a></li> <li><a href="{% url 'website:cfp' %}">Main Menu</a></li> - </ul> + </ul> + {% else %} + <li><a href="{% url 'website:cfp' %}" >Login</a></li> {% endif %} - </ul> - </nav> + </ul> + </div> + <!--/.nav-collapse --> + </div> +</div> {% endblock %} @@ -52,44 +59,68 @@ - <form action="" method="post"> {% csrf_token %} + <form action="{% url 'website:delete' %}" method="post"> {% csrf_token %} <table class="table"> <colgroup> + {% if user.is_superuser %} + <col width="10%" /> + <col width="20%" /> + <col width="60%" /> + <col width="10%" /> + <col width="10%" /> <col width="20%" /> + {% else %} + <col width="10%" /> + <col width="60%" /> + <col width="10%" /> <col width="10%" /> <col width="20%" /> - <col width="80%" /> - <!-- <col width="20%" /> --> + + {% endif %} </colgroup> - <th> Select - <th> Sr + <th> <center>Select + {% if user.is_superuser %} <th>Speaker - <th> Title - <!-- <th> Comments --> + {% endif %} + <th> <center>Title + <th> View + <th> Comments + <th> Status</center> {% for proposal in proposals %} <tr> - <td> <input type = "checkbox" name="delete_proposal" value = {{proposal.id}}></input></td> - <td> - {{ forloop.counter }} - </td> + <td><center> <input type = "checkbox" name="delete_proposal" value = {{proposal.id}}></input></center></td> + {% if user.is_superuser %} <td> {{ proposal.user.get_full_name}} </td> + {% endif %} + <td style="white-space: nowrap; text-overflow:ellipsis; overflow: hidden; max-width:.5px;"> <center>{{proposal.title}}</td> {% if user.is_superuser %} - <td style="white-space: nowrap; text-overflow:ellipsis; overflow: hidden; max-width:.5px;"><a href="{% url 'website:comment_abstract' proposal.id %}">{{proposal.title}}</a> </td> + <td ><a href="{% url 'website:comment_abstract' proposal.id %}">View</a> </td> {% else %} - <td style="white-space: nowrap; text-overflow:ellipsis; overflow: hidden; max-width:.5px;"><a href="{% url 'website:abstract_details' proposal.id %}">{{proposal.title}}</a> </td> + <td ><a href="{% url 'website:abstract_details' proposal.id %}">View</a> </td> {% endif %} + <td><center> 0 </center></td> + + <td> + {% if proposal.status = 'Accepted' %} + <h5 style="color:green;">{{proposal.status}}</h5> + {% elif proposal.status = 'Rejected' %} + <h5 style="color:red;">{{proposal.status}}</h5> + {% else %} + <h5 style="color:blue;">{{proposal.status}}</h5> + {% endif %} + + </td> </tr> {% endfor %} </table> - <center><button class="btn" type="submit">Delete</button></center> + <center><input type="submit" value="Delete" name="delete"/></center> </form> </section> </div> - {% endblock %} <!-- Scripts --> @@ -101,5 +132,13 @@ <!--[if lte IE 8]><script src="assets/js/ie/respond.min.js"></script><![endif]--> <script src="assets/js/main.js"></script> - </body> + + +<script> +function hello(){ + alert('hi'); +} +</script> + +</body> </html> diff --git a/website/urls.py b/website/urls.py index 243d9bf..d88d204 100644 --- a/website/urls.py +++ b/website/urls.py @@ -10,7 +10,11 @@ urlpatterns = patterns('', url(r'^submit-cfp/$', 'website.views.submitcfp', name='submitcfp'), url(r'^submit-cfw/$', 'website.views.submitcfw', name='submitcfw'), url(r'^accounts/register/$', 'website.views.userregister', name='userregister'), + # url(r'^view-abstracts/$', 'website.views.view_abstracts', name='view_abstracts'), url(r'^view-abstracts/$', 'website.views.view_abstracts', name='view_abstracts'), url(r'^abstract-details/(?P<proposal_id>\d+)$', 'website.views.abstract_details', name='abstract_details'), + url(r'^view-abstracts/delete/$', 'website.views.delete', name='delete'), url(r'^comment-abstract/(?P<proposal_id>\d+)$', 'website.views.comment_abstract', name='comment_abstract'), + url(r'^comment-abstract/status/(?P<proposal_id>\d+)$', 'website.views.status', name='status'), + )+ static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) diff --git a/website/urls.pyc b/website/urls.pyc Binary files differindex ec44ed6..357908c 100644 --- a/website/urls.pyc +++ b/website/urls.pyc diff --git a/website/views.py b/website/views.py index f53cf51..fbd368a 100644 --- a/website/views.py +++ b/website/views.py @@ -55,7 +55,20 @@ def userregister(request): def home(request): - return render(request, 'base.html') + context = {} + context.update(csrf(request)) + if request.method == "POST": + sender_name = request.POST['name'] + sender_email = request.POST['email'] + to = ('scipy@fossee.in',) + subject = "Query from - "+sender_name + message = request.POST['message'] + try: + send_mail(subject, message, sender_email, to) + context['mailsent'] = True + except: + context['mailfailed'] = True + return render_to_response('base.html', context) def cfp(request): @@ -78,7 +91,10 @@ def cfp(request): next = request.GET['next'] return HttpResponseRedirect(next) if Proposal.objects.filter(user = user).exists : + print "---------------------->>>>>>>>>>", user proposals = Proposal.objects.filter(user = user) + for p in proposals: + print "-------->", p context['proposals'] = proposals context['user'] = user return render_to_response('cfp.html', context) @@ -125,7 +141,7 @@ def submitcfp(request): else: form = ProposalForm() context['proposal_form'] = form - return render_to_response('submit-cfp.html', context) + return render_to_response('submit-cfp.html', context) #when link clicked else: context['login_required'] = True return render_to_response('cfp.html', context) @@ -153,7 +169,7 @@ def submitcfw(request): return render_to_response('cfp.html', context) else: context['proposal_form'] = form - return render_to_response('submit-cfp.html', context) + return render_to_response('submit-cfw.html', context) else: form = WorkshopForm() context['proposal_form'] = form @@ -173,23 +189,24 @@ def view_abstracts(request): context['user'] = user return render(request, 'view-abstracts.html', context) elif user is not None: - if request.method == "POST": - print "---------------------",request.POST - # delete_proposal = request.POST.getlist('delete_proposal') - # for propsal_id in delete_proposal: - # proposal = Proposal.objects.get(id = proposal_id) - # proposal.delete() - context = RequestContext(request, {'request': request, - 'user': request.user, - 'form': form}) - context.update(csrf(request)) - return render_to_response('view-abstracts.html',context_instance=context) + # if request.method == "POST": + # if request.POST.get('delete'): + # Proposal.objects.filter(id__in=request.POST.getlist('delete_proposal')).delete() + # # print "---------------------",request.POST + # # delete_proposal = request.POST.getlist('delete_proposal') + # # for propsal_id in delete_proposal: + # # proposal = Proposal.objects.get(id = proposal_id) + # # proposal.remove() + # context = RequestContext(request, {'request': request, + # 'user': request.user}) + # context.update(csrf(request)) + # return render(request, 'view-abstracts.html',context_instance=context) if Proposal.objects.filter(user = user).exists : print "in view-abstracts ---------------------->>>>>>>>>>", user proposals = Proposal.objects.filter(user = user) context['proposals'] = proposals context['user'] = user - return render_to_response('view-abstracts.html', context) + return render(request, 'view-abstracts.html', context) else: return render(request, 'cfp.html') else: @@ -206,6 +223,7 @@ def abstract_details(request, proposal_id=None): context['user'] = user return render(request, 'abstract_details.html', context) elif user is not None: + print "---------------------->>>>>>>>>>", proposal_id proposal = Proposal.objects.get(id=proposal_id) comments = Comments.objects.filter(proposal=proposal) context['proposal'] = proposal @@ -230,28 +248,84 @@ def comment_abstract(request, proposal_id = None): comment.proposal = proposal comment.save() comments = Comments.objects.filter(proposal=proposal) + print "proposal", proposal.title + print "comment", comment.comment + print "moderator", request.user + print "proposal poster", proposal.user.email + sender_name = "SciPy India 2016" + sender_email = "scipy@fossee.in" + subject = "SciPy India - Comment of Your Proposal" + to = (proposal.user.email, ) + message = """Dear """+proposal.user.first_name+""",\n\nThank You ! \n\nRegards,\nSciPy India 2016,\nFOSSEE - IIT Bombay""" + send_mail(subject, message, sender_email, to) + context['proposal'] = proposal + context['comments'] = comments + # if request.GET.get("accept"): + # print "-----------user clicked list" + context.update(csrf(request)) + return render(request, 'comment-abstract.html', context) + # elif request.GET.get("accept"): + # print"----------------- accept" + # context.update(csrf(request)) + # return render(request, 'comment-abstract.html', context) + else: + comments = Comments.objects.filter(proposal=proposal) context['proposal'] = proposal context['comments'] = comments context.update(csrf(request)) return render(request, 'comment-abstract.html', context) - comments = Comments.objects.filter(proposal=proposal) - context['proposal'] = proposal - context['comments'] = comments - return render(request, 'comment-abstract.html', context) else: return render(request, 'comment-abstract.html', context) +def status(request, proposal_id= None): + user = request.user + context = {} + if user.is_authenticated(): + proposal = Proposal.objects.get(id=proposal_id) + if 'accept' in request.POST: + proposal.status="Accepted" + proposal.save() + sender_name = "SciPy India 2016" + sender_email = "scipy@fossee.in" + subject = "SciPy India - Proposal Accepted" + to = (proposal.user.email, ) + message = """Dear """+proposal.user.first_name+""",\n\nThank You ! \n\nRegards,\nSciPy India 2016,\nFOSSEE - IIT Bombay""" + send_mail(subject, message, sender_email, to) + context.update(csrf(request)) + elif 'reject' in request.POST: + proposal.status="Rejected" + proposal.save() + sender_name = "SciPy India 2016" + sender_email = "scipy@fossee.in" + subject = "SciPy India - Proposal Rejected" + to = (proposal.user.email, ) + message = """Dear """+proposal.user.first_name+""",\n\nThank You ! \n\nRegards,\nSciPy India 2016,\nFOSSEE - IIT Bombay""" + send_mail(subject, message, sender_email, to) + context.update(csrf(request)) + proposals = Proposal.objects.all() + context['proposals'] = proposals + context['user'] = user + return render(request, 'view-abstracts.html', context) + + + +def delete(request): + user = request.user + context = {} + if user.is_authenticated(): + if 'delete' in request.POST: + delete_proposal = request.POST.getlist('delete_proposal') + print"-------------- in delete", delete_proposal + for proposal_id in delete_proposal: + print proposal_id + proposal = Proposal.objects.get(id = proposal_id) + proposal.delete() + context.update(csrf(request)) + proposals = Proposal.objects.all() + context['proposals'] = proposals + context['user'] = user + return render(request, 'view-abstracts.html', context) -# def delete(request,proposaloposal_id): -# user = request.user -# context = {} -# if request.POST: -# proposals=Proposal.objects.filter(proposal_id=proposal_id).delete() -# return render(request, 'cfp.html') -# else: -# context['proposals'] = proposals -# context['user'] = user -# return render_to_response('view-abstracts.html', context)
\ No newline at end of file diff --git a/website/views.pyc b/website/views.pyc Binary files differindex 97ab16b..8d6e153 100644 --- a/website/views.pyc +++ b/website/views.pyc |