remotes/origin/1203
Nazar Kotjuk 10 years ago
commit 0352ea9b9c
  1. 2
      company/views.py
  2. 22
      core/urls.py
  3. 76
      core/utils.py
  4. 25
      core/views.py
  5. 8
      exposition/forms.py
  6. 3
      specialist_catalog/forms.py
  7. 5
      specialist_catalog/management/commands/create_country_page.py
  8. 1
      specialist_catalog/models.py
  9. 29
      specialist_catalog/views.py
  10. 2
      static/ckeditor/ckeditor/build-config.js
  11. 2
      static/ckeditor/ckeditor/lang/en.js
  12. 2
      static/ckeditor/ckeditor/plugins/a11yhelp/dialogs/a11yhelp.js
  13. 2
      static/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ar.js
  14. 2
      static/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/bg.js
  15. 2
      static/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ca.js
  16. 2
      static/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/cs.js
  17. 2
      static/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/cy.js
  18. 2
      static/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/da.js
  19. 2
      static/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/de.js
  20. 2
      static/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/el.js
  21. 2
      static/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/en.js
  22. 2
      static/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/eo.js
  23. 2
      static/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/es.js
  24. 2
      static/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/et.js
  25. 2
      static/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/fa.js
  26. 2
      static/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/fi.js
  27. 2
      static/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/fr.js
  28. 2
      static/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/gu.js
  29. 2
      static/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/he.js
  30. 2
      static/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/hi.js
  31. 2
      static/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/hr.js
  32. 2
      static/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/hu.js
  33. 2
      static/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/it.js
  34. 2
      static/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ja.js
  35. 2
      static/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/km.js
  36. 2
      static/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ku.js
  37. 2
      static/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/lt.js
  38. 2
      static/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/lv.js
  39. 2
      static/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/mk.js
  40. 2
      static/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/mn.js
  41. 2
      static/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/nb.js
  42. 2
      static/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/nl.js
  43. 2
      static/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/no.js
  44. 2
      static/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/pl.js
  45. 2
      static/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/pt-br.js
  46. 2
      static/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/pt.js
  47. 2
      static/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ro.js
  48. 2
      static/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ru.js
  49. 2
      static/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/sk.js
  50. 2
      static/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/sl.js
  51. 2
      static/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/sv.js
  52. 2
      static/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/th.js
  53. 2
      static/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/tr.js
  54. 2
      static/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ug.js
  55. 2
      static/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/uk.js
  56. 2
      static/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/vi.js
  57. 2
      static/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/zh-cn.js
  58. 2
      static/ckeditor/ckeditor/plugins/about/dialogs/about.js
  59. 2
      static/ckeditor/ckeditor/plugins/clipboard/dialogs/paste.js
  60. 2
      static/ckeditor/ckeditor/plugins/colordialog/dialogs/colordialog.js
  61. 2
      static/ckeditor/ckeditor/plugins/dialog/dialogDefinition.js
  62. 2
      static/ckeditor/ckeditor/plugins/div/dialogs/div.js
  63. 2
      static/ckeditor/ckeditor/plugins/find/dialogs/find.js
  64. 2
      static/ckeditor/ckeditor/plugins/flash/dialogs/flash.js
  65. 2
      static/ckeditor/ckeditor/plugins/forms/dialogs/form.js
  66. 2
      static/ckeditor/ckeditor/plugins/forms/dialogs/hiddenfield.js
  67. 2
      static/ckeditor/ckeditor/plugins/forms/dialogs/select.js
  68. 2
      static/ckeditor/ckeditor/plugins/forms/dialogs/textarea.js
  69. 2
      static/ckeditor/ckeditor/plugins/iframe/dialogs/iframe.js
  70. 2
      static/ckeditor/ckeditor/plugins/image/dialogs/image.js
  71. 2
      static/ckeditor/ckeditor/plugins/link/dialogs/anchor.js
  72. 2
      static/ckeditor/ckeditor/plugins/link/dialogs/link.js
  73. 2
      static/ckeditor/ckeditor/plugins/liststyle/dialogs/liststyle.js
  74. 2
      static/ckeditor/ckeditor/plugins/oembed/libs/jquery.oembed.js
  75. 2
      static/ckeditor/ckeditor/plugins/oembed/libs/jquery.oembed.min.js
  76. 2
      static/ckeditor/ckeditor/plugins/pastefromword/filter/default.js
  77. 2
      static/ckeditor/ckeditor/plugins/smiley/dialogs/smiley.js
  78. 2
      static/ckeditor/ckeditor/plugins/sourcedialog/dialogs/sourcedialog.js
  79. 2
      static/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ca.js
  80. 2
      static/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/cs.js
  81. 2
      static/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/cy.js
  82. 2
      static/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/de.js
  83. 2
      static/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/el.js
  84. 2
      static/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/en.js
  85. 2
      static/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/eo.js
  86. 2
      static/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/et.js
  87. 2
      static/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/fa.js
  88. 2
      static/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/fi.js
  89. 2
      static/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/fr.js
  90. 2
      static/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/he.js
  91. 2
      static/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/hr.js
  92. 2
      static/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/it.js
  93. 2
      static/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ku.js
  94. 2
      static/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/lv.js
  95. 2
      static/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/nb.js
  96. 2
      static/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/nl.js
  97. 2
      static/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/no.js
  98. 2
      static/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/pl.js
  99. 2
      static/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/pt-br.js
  100. 2
      static/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/sk.js
  101. Some files were not shown because too many files have changed in this diff Show More

@ -21,7 +21,7 @@ from meta.views import MetadataMixin
class CompanySearchView(ListView):
paginate_by = 10
template_name = 'company/search.html'
template_name = 'client/company/search.html'
search_form = CompanySearchForm
model = Company

@ -1,11 +1,11 @@
from django.conf.urls import url, patterns
from models import LatestExpositions, CountryFeeds, CityFeeds, ThemeFeeds
urlpatterns = patterns('',
url(r'^latest/$', LatestExpositions()),
url(r'^country/(?P<slug>.*)/$', CountryFeeds()),
url(r'^city/(?P<slug>.*)/$', CityFeeds()),
url(r'^theme/(?P<slug>.*)/$', ThemeFeeds()),
)
from django.conf.urls import url, patterns
from models import LatestExpositions, CountryFeeds, CityFeeds, ThemeFeeds
urlpatterns = patterns('',
url(r'^latest/$', LatestExpositions()),
url(r'^country/(?P<slug>.*)/$', CountryFeeds()),
url(r'^city/(?P<slug>.*)/$', CityFeeds()),
url(r'^theme/(?P<slug>.*)/$', ThemeFeeds()),
)

@ -1,5 +1,9 @@
# -*- coding: utf-8 -*-
"""
http://www.simplistix.co.uk/presentations/python-excel.pdf
"""
import xlwt
import datetime
from django.core.exceptions import ObjectDoesNotExist
@ -12,6 +16,7 @@ CELL_STYLE_MAP = (
(bool, xlwt.easyxf(num_format_str='BOOLEAN')),
)
def multi_getattr(obj, attr, default=None):
attributes = attr.split(".")
for i in attributes:
@ -39,33 +44,64 @@ def get_column_cell(obj, name):
return attr
def queryset_to_workbook(queryset, columns, header_style=None, default_style=None, cell_style_map=None):
def queryset_to_workbook(queryset, columns, report_date = None):
# defining styles for different types of cells
main_style = xlwt.Style.easyxf(
"font: name Calibri, height 600, bold False;"
"borders: left thin, right thin, top thin, bottom thin;"
"alignment: horizontal left, vertical center, indent 7;"
"pattern: pattern solid, fore_colour white;"
)
header_style = xlwt.Style.easyxf(
'font: name Calibri, height 400, bold False;'
'borders: left no_line, right no_line, top thin, bottom thin;'
'alignment: horizontal center, shrink_to_fit True;'
'pattern: pattern solid, fore_color gray_ega;',
)
odd_style = xlwt.Style.easyxf(
'font: name Calibri, height 300, bold False;'
'borders: left thin, right thin, top thin, bottom thin;'
'alignment: horizontal center, wrap True;'
'pattern: pattern solid, fore_color white;',
)
even_style = xlwt.Style.easyxf(
'font: name Calibri, height 300, bold False;'
'borders: left thin, right thin, top thin, bottom thin;'
'alignment: horizontal center, wrap True;'
'pattern: pattern solid, fore_color silver_ega;',
)
# creating workbook and adding sheet
workbook = xlwt.Workbook()
report_date = datetime.date.today()
sheet_name = u'My calendar {0}'.format(report_date.strftime('%Y-%m-%d'))
report_date = report_date or datetime.date.today()
sheet_name = u'My calendar {0}'.format(report_date.strftime('%Y-%B'))
sheet = workbook.add_sheet(sheet_name)
sheet.insert_bitmap('')
if not header_style:
header_style = HEADER_STYLE
if not default_style:
default_style = DEFAULT_STYLE
if not cell_style_map:
cell_style_map = CELL_STYLE_MAP
obj = queryset[0]
# drawing head part with image
sheet.write_merge(0, 6, 0, 6, u'Мой календарь собитий на %s года' % report_date.strftime("%B %Y"), main_style)
for i in range(7):
sheet.row(i).set_style(xlwt.Style.easyxf('font:height 300;'))
sheet.insert_bitmap('/home/www/proj/media/logo.bmp', row=0, col=5, x=0, y=0, scale_x=0.3, scale_y=2)
# drawing headers
header_list = [u'#', u'Название события',u'Даты',u'Краткое описание',u'Место проведения', u'Заметка', u'Ссылка на событие']
for i, column in enumerate(columns):
header_list=[u'#', u'Название события',u'Даты',u'Краткое описание',u'Место проведения', u'Заметка', u'Ссылка на событие']
sheet.write(0, i, header_list[i], header_style)
sheet.write(8, i, header_list[i], header_style)
sheet.col(i).width = 8000
sheet.col(0).width = 2000
for x, obj in enumerate(queryset, start=1):
# fill data
for x, obj in enumerate(queryset, start=9):
for y, column in enumerate(columns):
value = getattr(obj, column)
style = default_style
for value_type, cell_style in cell_style_map:
if isinstance(value, value_type):
style = cell_style
try:
value = getattr(obj, column)
except:
value = "-"
if x % 2 == 0:
style = even_style
else:
style = odd_style
sheet.write(x, y, value, style)
return workbook

@ -220,7 +220,7 @@ class PageList(ListView):
from django.http import HttpResponseRedirect
import datetime
class EditPage(UpdateView):
model = Page
@ -259,23 +259,30 @@ from django.utils.translation import get_language
from .utils import queryset_to_workbook
from exposition.models import Exposition
from conference.models import Conference
from django.core.urlresolvers import reverse
def download_workbook(request):
lang = get_language()
data = [(36539, 'expo'),(36602, 'expo')]#, (3033, 'conf'), (3053, 'conf')]
data = request.GET
qs = []
for obj in data:
if obj[1] == 'expo':
qs.append(Exposition.objects.language(lang).get(id=obj[0]))
for i,obj in enumerate(data):
if data.get('data[%i][name]'%i) == 'expo':
qs.append(Exposition.objects.language(lang).get(id=data['data[%i][value]'%i]))
elif data.get('data[%i][name]'%i) == 'conf':
qs.append(Conference.objects.language(lang).get(id=data['data[%i][value]'%i]))
elif obj[1] == 'conf':
qs.append(Conference.objects.language(lang).get(id=obj[0]))
earliest_event = qs[0].data_begin
for i, obj in enumerate(qs, start=1):
if obj.data_begin < earliest_event:
earliest_event = obj.data_begin
setattr(obj, 'number', i)
setattr(obj, 'dates', u'%s - %s'%(obj.data_begin.strftime('%d %B %Y'),obj.data_end.strftime('%d %B %Y')))
setattr(obj, 'full_place', u'%s, %s, %s' % (obj.country, obj.city, getattr(obj.place, 'name', '')))
setattr(obj, 'link', u'expomap.ru%s'%obj.get_absolute_url())
try:
setattr(obj, 'link', u'http://www.expomap.ru%s)'%obj.get_absolute_url())
except:
setattr(obj, 'link', u'http://www.expomap.ru%s)'%obj.get_permanent_url())
columns = (
'number',
@ -286,7 +293,7 @@ def download_workbook(request):
'participation_note',
'link')
workbook = queryset_to_workbook(qs, columns)
workbook = queryset_to_workbook(qs, columns, earliest_event)
response = HttpResponse(content_type='application/vnd.ms-excel')
response['Content-Disposition'] = 'attachment; filename="My calendar.xls"'
workbook.save(response)

@ -217,7 +217,6 @@ class ExpositionCreateForm(forms.Form):
exposition.country = Country.objects.get(id=data['country'])
exposition.city = City.objects.get(id=data['city'])
if data.get('place'):
exposition.place = PlaceExposition.objects.get(id=data['place'])
else:
@ -359,7 +358,6 @@ class ExpositionCreateForm(forms.Form):
price_catalog = cleaned_data.get('price_catalog').strip()
return is_positive_integer(price_catalog)
def clean_visitors(self):
"""
checking visitors
@ -449,6 +447,12 @@ class ExpositionCreateForm(forms.Form):
discount = cleaned_data.get('discount').strip()
return is_positive_integer(discount)
class ExpositionDeleteForm(forms.ModelForm):
url = forms.CharField(widget=forms.HiddenInput())

@ -61,4 +61,5 @@ class FeedbackForm(forms.ModelForm):
fields = ['company', 'name', 'text', 'logo', 'catalog']
widgets = {
'text':CKEditorWidget
}
}

@ -3,6 +3,9 @@ from django.core.management.base import BaseCommand
from django.utils.translation import activate
from country.models import Country
from specialist_catalog.models import SpecialistCatalog
from django.utils.translation import activate
activate('ru')
default_text = u"Планируете посетить выставку %s?" \
u" Мы предлагаем Вам подобрать переводчика именно под Ваши цели и потребности. " \
@ -36,4 +39,4 @@ class Command(BaseCommand):
benefits = default_benefits
)
sc.save()
print "created for: %s" % cntry.url
print "created for: %s" % cntry.url

@ -20,6 +20,7 @@ class Specialist(models.Model):
country = models.ForeignKey(Country, on_delete=models.PROTECT, verbose_name=u"Страна")
photo = models.ImageField(verbose_name=u"Фото", upload_to="specialist_catalog/specialist_photo/", blank=True)
def __unicode__(self):
return u"%s" % self.name

@ -23,11 +23,24 @@ class SpecialistCreateView(CreateView):
success_url = reverse_lazy("specialist_all")
from hvad.utils import get_translation_aware_manager
class SpecialistListView(ListView):
model = Specialist
template_name = 'admin/specialist/specialist_all.html'
paginate_by = settings.ADMIN_PAGINATION
def get_queryset(self):
name = self.request.GET.get('name', None)
city = self.request.GET.get('city', None)
qs = get_translation_aware_manager(Specialist).all()
if name:
qs = qs.filter(name__icontains=name)
if city:
qs = qs.filter(city__name__icontains=city)
return qs
class SpecialistUpdateView(UpdateView):
form_class = SpecialistForm
@ -69,8 +82,11 @@ class CatalogCityView(ListView):
paginate_by = settings.ADMIN_PAGINATION
def get_queryset(self):
qs = super(CatalogCityView, self).get_queryset()
return qs.filter(type=2)
query = self.request.GET.get('query', None)
qs = self.model.objects.language().filter(type=2)
if query:
qs = qs.filter(title__icontains=query)
return qs
class CatalogCountryView(ListView):
@ -79,8 +95,11 @@ class CatalogCountryView(ListView):
paginate_by = settings.ADMIN_PAGINATION
def get_queryset(self):
qs = super(CatalogCountryView, self).get_queryset()
return qs.filter(type=1)
query = self.request.GET.get('query', None)
qs = self.model.objects.language().filter(type=1)
if query:
qs = qs.filter(title__icontains=query)
return qs
class CatalogUpdateView(UpdateView):
@ -203,4 +222,4 @@ class SpecCatalog(ListView):
context['title'] = _(u'Переводчики по странам')
else:
context['title'] = _(u'Переводчики по городам')
return context
return context

@ -1,4 +1,4 @@

/**
* @license Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
* For licensing, see LICENSE.html or http://ckeditor.com/license

@ -1,4 +1,4 @@
/*
/*
Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/

@ -1,4 +1,4 @@
/*
/*
Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/

@ -1,4 +1,4 @@
/*
/*
Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/

@ -1,4 +1,4 @@
/*
/*
Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/

@ -1,4 +1,4 @@
/*
/*
Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/

@ -1,4 +1,4 @@
/*
/*
Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/

@ -1,4 +1,4 @@
/*
/*
Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/

@ -1,4 +1,4 @@
/*
/*
Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/

@ -1,4 +1,4 @@
/*
/*
Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/

@ -1,4 +1,4 @@
/*
/*
Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/

@ -1,4 +1,4 @@
/*
/*
Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/

@ -1,4 +1,4 @@
/*
/*
Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/

@ -1,4 +1,4 @@
/*
/*
Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/

@ -1,4 +1,4 @@
/*
/*
Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/

@ -1,4 +1,4 @@
/*
/*
Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/

@ -1,4 +1,4 @@
/*
/*
Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/

@ -1,4 +1,4 @@
/*
/*
Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/

@ -1,4 +1,4 @@
/*
/*
Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/

@ -1,4 +1,4 @@
/*
/*
Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/

@ -1,4 +1,4 @@
/*
/*
Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/

@ -1,4 +1,4 @@
/*
/*
Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/

@ -1,4 +1,4 @@
/*
/*
Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/

@ -1,4 +1,4 @@
/*
/*
Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/

@ -1,4 +1,4 @@
/*
/*
Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/

@ -1,4 +1,4 @@
/*
/*
Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/

@ -1,4 +1,4 @@
/*
/*
Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/

@ -1,4 +1,4 @@
/*
/*
Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/

@ -1,4 +1,4 @@
/*
/*
Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/

@ -1,4 +1,4 @@
/*
/*
Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/

@ -1,4 +1,4 @@
/*
/*
Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/

@ -1,4 +1,4 @@
/*
/*
Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/

@ -1,4 +1,4 @@
/*
/*
Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/

@ -1,4 +1,4 @@
/*
/*
Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/

@ -1,4 +1,4 @@
/*
/*
Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/

@ -1,4 +1,4 @@
/*
/*
Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/

@ -1,4 +1,4 @@
/*
/*
Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/

@ -1,4 +1,4 @@
/*
/*
Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/

@ -1,4 +1,4 @@
/*
/*
Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/

@ -1,4 +1,4 @@
/*
/*
Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/

@ -1,4 +1,4 @@
/*
/*
Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/

@ -1,4 +1,4 @@
/*
/*
Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/

@ -1,4 +1,4 @@
/*
/*
Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/

@ -1,4 +1,4 @@
/*
/*
Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/

@ -1,4 +1,4 @@
/*
/*
Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/

@ -1,4 +1,4 @@
/*
/*
Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/

@ -1,4 +1,4 @@
/*
/*
Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/

@ -1,4 +1,4 @@
/*
/*
Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/

@ -1,4 +1,4 @@
/*
/*
Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/

@ -1,4 +1,4 @@
/*
/*
Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/

@ -1,4 +1,4 @@
/*
/*
Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/

@ -1,4 +1,4 @@
/*
/*
Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/

@ -1,4 +1,4 @@
(function(){function p(a,k,o){if(!k.is||!k.getCustomData("block_processed"))k.is&&CKEDITOR.dom.element.setMarker(o,k,"block_processed",!0),a.push(k)}function n(a,k){function o(){this.foreach(function(d){if(/^(?!vbox|hbox)/.test(d.type)&&(d.setup||(d.setup=function(c){d.setValue(c.getAttribute(d.id)||"",1)}),!d.commit))d.commit=function(c){var a=this.getValue();"dir"==d.id&&c.getComputedStyle("direction")==a||(a?c.setAttribute(d.id,a):c.removeAttribute(d.id))}})}var n=function(){var d=CKEDITOR.tools.extend({},
(function(){function p(a,k,o){if(!k.is||!k.getCustomData("block_processed"))k.is&&CKEDITOR.dom.element.setMarker(o,k,"block_processed",!0),a.push(k)}function n(a,k){function o(){this.foreach(function(d){if(/^(?!vbox|hbox)/.test(d.type)&&(d.setup||(d.setup=function(c){d.setValue(c.getAttribute(d.id)||"",1)}),!d.commit))d.commit=function(c){var a=this.getValue();"dir"==d.id&&c.getComputedStyle("direction")==a||(a?c.setAttribute(d.id,a):c.removeAttribute(d.id))}})}var n=function(){var d=CKEDITOR.tools.extend({},
CKEDITOR.dtd.$blockLimit);a.config.div_wrapTable&&(delete d.td,delete d.th);return d}(),q=CKEDITOR.dtd.div,l={},m=[];return{title:a.lang.div.title,minWidth:400,minHeight:165,contents:[{id:"info",label:a.lang.common.generalTab,title:a.lang.common.generalTab,elements:[{type:"hbox",widths:["50%","50%"],children:[{id:"elementStyle",type:"select",style:"width: 100%;",label:a.lang.div.styleSelectLabel,"default":"",items:[[a.lang.common.notSet,""]],onChange:function(){var d=["info:elementStyle","info:class",
"advanced:dir","advanced:style"],c=this.getDialog(),h=c._element&&c._element.clone()||new CKEDITOR.dom.element("div",a.document);this.commit(h,!0);for(var d=[].concat(d),b=d.length,i,e=0;e<b;e++)(i=c.getContentElement.apply(c,d[e].split(":")))&&i.setup&&i.setup(h,!0)},setup:function(a){for(var c in l)l[c].checkElementRemovable(a,!0)&&this.setValue(c,1)},commit:function(a){var c;(c=this.getValue())?l[c].applyToObject(a):a.removeAttribute("style")}},{id:"class",type:"text",label:a.lang.common.cssClass,
"default":""}]}]},{id:"advanced",label:a.lang.common.advancedTab,title:a.lang.common.advancedTab,elements:[{type:"vbox",padding:1,children:[{type:"hbox",widths:["50%","50%"],children:[{type:"text",id:"id",label:a.lang.common.id,"default":""},{type:"text",id:"lang",label:a.lang.common.langCode,"default":""}]},{type:"hbox",children:[{type:"text",id:"style",style:"width: 100%;",label:a.lang.common.cssStyle,"default":"",commit:function(a){a.setAttribute("style",this.getValue())}}]},{type:"hbox",children:[{type:"text",

@ -1,4 +1,4 @@
/*
/*
Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/

@ -1,4 +1,4 @@
/*
/*
Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/

@ -1,4 +1,4 @@
/*
/*
Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/

@ -1,4 +1,4 @@
/*
/*
Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/

@ -1,4 +1,4 @@
/*
/*
Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/

@ -1,4 +1,4 @@
/*
/*
Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/

@ -1,4 +1,4 @@
/*
/*
Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/

@ -1,4 +1,4 @@
/*
/*
Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/

@ -1,4 +1,4 @@
/*
/*
Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/

@ -1,4 +1,4 @@
/*
/*
Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/

@ -1,4 +1,4 @@
/*
/*
Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/

@ -1,4 +1,4 @@
(function(a){function n(b,a){a=a?a:"";return b?n(--b,"0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZabcdefghiklmnopqrstuvwxyz".charAt(Math.floor(60*Math.random()))+a):a}function p(b,a){var f=b.apiendpoint,d="",g,f=f+(0>=f.indexOf("?")?"?":"&"),f=f.replace("#","%23");if(null!==b.maxWidth&&("undefined"===typeof b.params.maxwidth||null===b.params.maxwidth))b.params.maxwidth=b.maxWidth;if(null!==b.maxHeight&&("undefined"===typeof b.params.maxheight||null===b.params.maxheight))b.params.maxheight=b.maxHeight;for(g in b.params)g!=
(function(a){function n(b,a){a=a?a:"";return b?n(--b,"0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZabcdefghiklmnopqrstuvwxyz".charAt(Math.floor(60*Math.random()))+a):a}function p(b,a){var f=b.apiendpoint,d="",g,f=f+(0>=f.indexOf("?")?"?":"&"),f=f.replace("#","%23");if(null!==b.maxWidth&&("undefined"===typeof b.params.maxwidth||null===b.params.maxwidth))b.params.maxwidth=b.maxWidth;if(null!==b.maxHeight&&("undefined"===typeof b.params.maxheight||null===b.params.maxheight))b.params.maxheight=b.maxHeight;for(g in b.params)g!=
b.callbackparameter&&null!==b.params[g]&&(d+="&"+escape(g)+"="+b.params[g]);f+="format="+b.format+"&url="+escape(a)+d;"json"!=b.dataType&&(f+="&"+b.callbackparameter+"=?");return f}function m(b,k,f){a("#jqoembeddata").data(k,b.code);l.beforeEmbed.call(f,b);l.onEmbed.call(f,b);l.afterEmbed.call(f,b)}function o(b,k,f){if(void 0!=a("#jqoembeddata").data(k)&&"iframe"!=f.embedtag.tag){var d={code:a("#jqoembeddata").data(k)};m(d,k,b)}else if(f.yql){var d=f.yql.from||"htmlstring",g=f.yql.url?f.yql.url(k):
k,e="SELECT * FROM "+d+' WHERE url="'+g+'" and '+(/html/.test(d)?"xpath":"itemPath")+"='"+(f.yql.xpath||"/")+"'";"html"==d&&(e+=" and compat='html5'");d=a.extend({url:"http://query.yahooapis.com/v1/public/yql",dataType:"jsonp",data:{q:e,format:"json",env:"store://datatables.org/alltableswithkeys",callback:"?"},success:function(c){if(f.yql.xpath&&"//meta|//title|//link"==f.yql.xpath){var e={};null==c.query.results&&(c.query.results={meta:[]});for(var d=0,h=c.query.results.meta.length;d<h;d++){var j=
c.query.results.meta[d].name||c.query.results.meta[d].property||null;null!=j&&(e[j.toLowerCase()]=c.query.results.meta[d].content)}if((!e.hasOwnProperty("title")||!e.hasOwnProperty("og:title"))&&null!=c.query.results.title)e.title=c.query.results.title;if(!e.hasOwnProperty("og:image")&&c.query.results.hasOwnProperty("link")){d=0;for(h=c.query.results.link.length;d<h;d++)c.query.results.link[d].hasOwnProperty("rel")&&"apple-touch-icon"==c.query.results.link[d].rel&&(e["og:image"]="/"==c.query.results.link[d].href.charAt(0)?

@ -1,4 +1,4 @@
(function(a){function n(b,a){a=a?a:"";return b?n(--b,"0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZabcdefghiklmnopqrstuvwxyz".charAt(Math.floor(60*Math.random()))+a):a}function p(b,a){var f=b.apiendpoint,d="",g,f=f+(0>=f.indexOf("?")?"?":"&"),f=f.replace("#","%23");if(null!==b.maxWidth&&("undefined"===typeof b.params.maxwidth||null===b.params.maxwidth))b.params.maxwidth=b.maxWidth;if(null!==b.maxHeight&&("undefined"===typeof b.params.maxheight||null===b.params.maxheight))b.params.maxheight=b.maxHeight;for(g in b.params)g!=
(function(a){function n(b,a){a=a?a:"";return b?n(--b,"0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZabcdefghiklmnopqrstuvwxyz".charAt(Math.floor(60*Math.random()))+a):a}function p(b,a){var f=b.apiendpoint,d="",g,f=f+(0>=f.indexOf("?")?"?":"&"),f=f.replace("#","%23");if(null!==b.maxWidth&&("undefined"===typeof b.params.maxwidth||null===b.params.maxwidth))b.params.maxwidth=b.maxWidth;if(null!==b.maxHeight&&("undefined"===typeof b.params.maxheight||null===b.params.maxheight))b.params.maxheight=b.maxHeight;for(g in b.params)g!=
b.callbackparameter&&null!==b.params[g]&&(d+="&"+escape(g)+"="+b.params[g]);f+="format="+b.format+"&url="+escape(a)+d;"json"!=b.dataType&&(f+="&"+b.callbackparameter+"=?");return f}function m(b,k,f){a("#jqoembeddata").data(k,b.code);l.beforeEmbed.call(f,b);l.onEmbed.call(f,b);l.afterEmbed.call(f,b)}function o(b,k,f){if(void 0!=a("#jqoembeddata").data(k)&&"iframe"!=f.embedtag.tag){var d={code:a("#jqoembeddata").data(k)};m(d,k,b)}else if(f.yql){var d=f.yql.from||"htmlstring",g=f.yql.url?f.yql.url(k):
k,e="SELECT * FROM "+d+' WHERE url="'+g+'" and '+(/html/.test(d)?"xpath":"itemPath")+"='"+(f.yql.xpath||"/")+"'";"html"==d&&(e+=" and compat='html5'");d=a.extend({url:"http://query.yahooapis.com/v1/public/yql",dataType:"jsonp",data:{q:e,format:"json",env:"store://datatables.org/alltableswithkeys",callback:"?"},success:function(c){if(f.yql.xpath&&"//meta|//title|//link"==f.yql.xpath){var e={};null==c.query.results&&(c.query.results={meta:[]});for(var d=0,h=c.query.results.meta.length;d<h;d++){var j=
c.query.results.meta[d].name||c.query.results.meta[d].property||null;null!=j&&(e[j.toLowerCase()]=c.query.results.meta[d].content)}if((!e.hasOwnProperty("title")||!e.hasOwnProperty("og:title"))&&null!=c.query.results.title)e.title=c.query.results.title;if(!e.hasOwnProperty("og:image")&&c.query.results.hasOwnProperty("link")){d=0;for(h=c.query.results.link.length;d<h;d++)c.query.results.link[d].hasOwnProperty("rel")&&"apple-touch-icon"==c.query.results.link[d].rel&&(e["og:image"]="/"==c.query.results.link[d].href.charAt(0)?

@ -1,4 +1,4 @@
/*
/*
Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/

@ -1,4 +1,4 @@
/*
/*
Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/

@ -1,4 +1,4 @@
/*
/*
Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/

@ -1,4 +1,4 @@
/*
/*
Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/

@ -1,4 +1,4 @@
/*
/*
Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/

@ -1,4 +1,4 @@
/*
/*
Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/

@ -1,4 +1,4 @@
/*
/*
Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/

@ -1,4 +1,4 @@
/*
/*
Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/

@ -1,4 +1,4 @@
/*
/*
Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/

@ -1,4 +1,4 @@
/*
/*
Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/

@ -1,4 +1,4 @@
/*
/*
Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/

@ -1,4 +1,4 @@
/*
/*
Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/

@ -1,4 +1,4 @@
/*
/*
Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/

@ -1,4 +1,4 @@
/*
/*
Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/

@ -1,4 +1,4 @@
/*
/*
Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/

@ -1,4 +1,4 @@
/*
/*
Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/

@ -1,4 +1,4 @@
/*
/*
Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/

@ -1,4 +1,4 @@
/*
/*
Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/

@ -1,4 +1,4 @@
/*
/*
Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/

@ -1,4 +1,4 @@
/*
/*
Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/

@ -1,4 +1,4 @@
/*
/*
Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/

@ -1,4 +1,4 @@
/*
/*
Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/

@ -1,4 +1,4 @@
/*
/*
Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/

@ -1,4 +1,4 @@
/*
/*
Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/

@ -1,4 +1,4 @@
/*
/*
Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save