mitri4
/
batiskaf
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

all pyc files removed

Browse Source
remotes/origin/artem
Gena 11 years ago
parent cf511f4e0e
commit 7a9f0894fd
47 changed files with 397 additions and 338 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      .idea/vcs.xml
  2. 609
      .idea/workspace.xml
  3. BIN
      api/__pycache__/__init__.cpython-34.pyc
  4. BIN
      api/__pycache__/urls.cpython-34.pyc
  5. BIN
      api/__pycache__/views.cpython-34.pyc
  6. BIN
      batiskaf/__pycache__/__init__.cpython-34.pyc
  7. BIN
      batiskaf/__pycache__/admin.cpython-34.pyc
  8. BIN
      batiskaf/__pycache__/celery.cpython-34.pyc
  9. BIN
      batiskaf/__pycache__/jinja2.cpython-34.pyc
  10. BIN
      batiskaf/__pycache__/models.cpython-34.pyc
  11. BIN
      batiskaf/__pycache__/settings.cpython-34.pyc
  12. BIN
      batiskaf/__pycache__/urls.cpython-34.pyc
  13. BIN
      batiskaf/__pycache__/wsgi.cpython-34.pyc
  14. 2
      batiskaf/jinja2.py
  15. BIN
      batiskaf/jinja2_ext/__pycache__/__init__.cpython-34.pyc
  16. BIN
      batiskaf/jinja2_ext/__pycache__/cart.cpython-34.pyc
  17. BIN
      batiskaf/jinja2_ext/__pycache__/thumbnails.cpython-34.pyc
  18. 99
      batiskaf/templates/jinja2/product.jinja
  19. BIN
      main/__pycache__/__init__.cpython-34.pyc
  20. BIN
      main/__pycache__/admin.cpython-34.pyc
  21. BIN
      main/__pycache__/models.cpython-34.pyc
  22. BIN
      main/__pycache__/views.cpython-34.pyc
  23. BIN
      main/migrations/__pycache__/0001_initial.cpython-34.pyc
  24. BIN
      main/migrations/__pycache__/0002_auto_20150328_1422.cpython-34.pyc
  25. BIN
      main/migrations/__pycache__/0003_auto_20150328_1428.cpython-34.pyc
  26. BIN
      main/migrations/__pycache__/0004_auto_20150328_1429.cpython-34.pyc
  27. BIN
      main/migrations/__pycache__/0005_auto_20150328_1452.cpython-34.pyc
  28. BIN
      main/migrations/__pycache__/0006_auto_20150328_1507.cpython-34.pyc
  29. BIN
      main/migrations/__pycache__/__init__.cpython-34.pyc
  30. 5
      static/less/_.css
  31. 18
      static/less/_.less
  32. BIN
      store/__pycache__/__init__.cpython-34.pyc
  33. BIN
      store/__pycache__/admin.cpython-34.pyc
  34. BIN
      store/__pycache__/cart.cpython-34.pyc
  35. BIN
      store/__pycache__/models.cpython-34.pyc
  36. BIN
      store/__pycache__/urls.cpython-34.pyc
  37. BIN
      store/__pycache__/views.cpython-34.pyc
  38. BIN
      store/migrations/__pycache__/0001_initial.cpython-34.pyc
  39. BIN
      store/migrations/__pycache__/0002_auto_20150329_0506.cpython-34.pyc
  40. BIN
      store/migrations/__pycache__/0003_auto_20150506_0553.cpython-34.pyc
  41. BIN
      store/migrations/__pycache__/0004_auto_20150506_1004.cpython-34.pyc
  42. BIN
      store/migrations/__pycache__/0005_auto_20150511_1617.cpython-34.pyc
  43. BIN
      store/migrations/__pycache__/0006_auto_20150514_1123.cpython-34.pyc
  44. BIN
      store/migrations/__pycache__/0007_auto_20150515_0902.cpython-34.pyc
  45. BIN
      store/migrations/__pycache__/0008_auto_20150526_1017.cpython-34.pyc
  46. BIN
      store/migrations/__pycache__/0009_auto_20150526_1021.cpython-34.pyc
  47. BIN
      store/migrations/__pycache__/__init__.cpython-34.pyc

2
.idea/vcs.xml
Unescape View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="" vcs="" />
<mapping directory="$PROJECT_DIR$" vcs="Git" />
</component>
</project>

609
.idea/workspace.xml
Unescape View File

@ -1,7 +1,33 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
<list default="true" id="9cf5b1bc-d173-4985-b42c-0de7ec941546" name="Default" comment="" />
<list default="true" id="9cf5b1bc-d173-4985-b42c-0de7ec941546" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gitignore" afterPath="$PROJECT_DIR$/.gitignore" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/static/less/_.less" afterPath="$PROJECT_DIR$/static/less/_.less" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/store/admin.py" afterPath="$PROJECT_DIR$/store/admin.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/batiskaf/templates/jinja2/base.jinja" afterPath="$PROJECT_DIR$/batiskaf/templates/jinja2/base.jinja" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/batiskaf/jinja2_ext/cart.py" afterPath="$PROJECT_DIR$/batiskaf/jinja2_ext/cart.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/store/cart.py" afterPath="$PROJECT_DIR$/store/cart.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/batiskaf/templates/jinja2/cart_detail.jinja" afterPath="$PROJECT_DIR$/batiskaf/templates/jinja2/cart_detail.jinja" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/batiskaf/templates/jinja2/category.jinja" afterPath="$PROJECT_DIR$/batiskaf/templates/jinja2/category.jinja" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/batiskaf/templates/jinja2/includes/category_filter.jinja" afterPath="$PROJECT_DIR$/batiskaf/templates/jinja2/includes/category_filter.jinja" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/batiskaf/templates/jinja2/index.jinja" afterPath="$PROJECT_DIR$/batiskaf/templates/jinja2/index.jinja" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/manage.py" afterPath="$PROJECT_DIR$/manage.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/store/models.py" afterPath="$PROJECT_DIR$/store/models.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/batiskaf/templates/jinja2/product.jinja" afterPath="$PROJECT_DIR$/batiskaf/templates/jinja2/product.jinja" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/batiskaf/settings.py" afterPath="$PROJECT_DIR$/batiskaf/settings.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/batiskaf/jinja2_ext/thumbnails.py" afterPath="$PROJECT_DIR$/batiskaf/jinja2_ext/thumbnails.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/urls.py" afterPath="$PROJECT_DIR$/api/urls.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/batiskaf/urls.py" afterPath="$PROJECT_DIR$/batiskaf/urls.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/store/urls.py" afterPath="$PROJECT_DIR$/store/urls.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/uwsgi.ini" afterPath="$PROJECT_DIR$/uwsgi.ini" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/vcs.xml" afterPath="$PROJECT_DIR$/.idea/vcs.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/views.py" afterPath="$PROJECT_DIR$/api/views.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/main/views.py" afterPath="$PROJECT_DIR$/main/views.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/store/views.py" afterPath="$PROJECT_DIR$/store/views.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/batiskaf/wsgi.py" afterPath="$PROJECT_DIR$/batiskaf/wsgi.py" />
</list>
<ignored path="batiskaf.iws" />
<ignored path=".idea/workspace.xml" />
<ignored path=".idea/dataSources.local.xml" />
@ -34,76 +60,73 @@
</component>
<component name="FileEditorManager">
<leaf>
<file leaf-file-name="views.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/store/views.py">
<file leaf-file-name="__init__.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/api/__init__.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="79" column="69" selection-start-line="79" selection-start-column="69" selection-end-line="79" selection-end-column="69" />
<folding>
<element signature="e#0#72#0" expanded="true" />
<marker date="1432796838000" expanded="true" signature="3198:3360" placeholder="SELECT MIN(p..store_productvariation..." />
</folding>
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="product.jinja" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/batiskaf/templates/jinja2/product.jinja">
<file leaf-file-name="models.py" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/main/models.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="71" column="0" selection-start-line="71" selection-start-column="0" selection-end-line="71" selection-end-column="0" />
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="category_filter.jinja" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/batiskaf/templates/jinja2/includes/category_filter.jinja">
<file leaf-file-name="admin.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/main/admin.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-2.5">
<caret line="14" column="41" selection-start-line="14" selection-start-column="41" selection-end-line="14" selection-end-column="41" />
<state vertical-scroll-proportion="0.0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="base.jinja" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/batiskaf/templates/jinja2/base.jinja">
<file leaf-file-name="admin.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/store/admin.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="90" column="75" selection-start-line="90" selection-start-column="75" selection-end-line="90" selection-end-column="75" />
<folding />
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding>
<element signature="e#0#32#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="_.less" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/static/less/_.less">
<file leaf-file-name="cart.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/store/cart.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="423" column="3" selection-start-line="423" selection-start-column="3" selection-end-line="423" selection-end-column="3" />
<folding>
<marker date="1432817385000" expanded="true" signature="14044:14045" placeholder="{...}" />
</folding>
<caret line="24" column="0" selection-start-line="24" selection-start-column="0" selection-end-line="24" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="category.jinja" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/batiskaf/templates/jinja2/category.jinja">
<file leaf-file-name="urls.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/store/urls.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.54389316">
<caret line="110" column="57" selection-start-line="110" selection-start-column="57" selection-end-line="110" selection-end-column="57" />
<state vertical-scroll-proportion="0.0">
<caret line="8" column="28" selection-start-line="8" selection-start-column="28" selection-end-line="8" selection-end-column="28" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="models.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/store/models.py">
<file leaf-file-name="manage.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/manage.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="196" column="39" selection-start-line="196" selection-start-column="39" selection-end-line="196" selection-end-column="39" />
<caret line="10" column="0" selection-start-line="10" selection-start-column="0" selection-end-line="10" selection-end-column="0" />
<folding />
</state>
</provider>
@ -120,12 +143,12 @@
</list>
</option>
</component>
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component>
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/templates/base.html" />
<option value="$PROJECT_DIR$/dashboard/templates/index.html" />
<option value="$PROJECT_DIR$/main/models.py" />
<option value="$PROJECT_DIR$/main/admin.py" />
<option value="$PROJECT_DIR$/dashboard/forms.py" />
<option value="$PROJECT_DIR$/dashboard/templates/includes/_attributes_form.html" />
@ -144,11 +167,8 @@
<option value="$PROJECT_DIR$/batiskaf/templates/base.html" />
<option value="$PROJECT_DIR$/static/bower_components/Bootflat/bootflat/scss/bootflat/_breadcrumb.scss" />
<option value="$PROJECT_DIR$/batiskaf/templates/category.html" />
<option value="$PROJECT_DIR$/store/admin.py" />
<option value="$PROJECT_DIR$/batiskaf/templates/jinja2/index.html" />
<option value="$PROJECT_DIR$/batiskaf/templates/jinja2/base.html" />
<option value="$PROJECT_DIR$/main/views.py" />
<option value="$PROJECT_DIR$/batiskaf/templates/jinja2/index.jinja" />
<option value="$PROJECT_DIR$/batiskaf/templates/includes/category_filter.html" />
<option value="$PROJECT_DIR$/batiskaf/templates/includes/img_thumbnail.html" />
<option value="$PROJECT_DIR$/batiskaf/templates/jinja2/includes/img_thumbnail.html" />
@ -156,24 +176,30 @@
<option value="$PROJECT_DIR$/static/bower_components/bootstrap/less/glyphicons.less" />
<option value="$PROJECT_DIR$/querystring_parser/parser.py" />
<option value="$PROJECT_DIR$/static/less/style.less" />
<option value="$PROJECT_DIR$/batiskaf/settings.py" />
<option value="$PROJECT_DIR$/api/urls.py" />
<option value="$PROJECT_DIR$/api/views.py" />
<option value="$PROJECT_DIR$/batiskaf/urls.py" />
<option value="$PROJECT_DIR$/batiskaf/jinja2_ext/thumbnails.py" />
<option value="$PROJECT_DIR$/batiskaf/jinja2.py" />
<option value="$PROJECT_DIR$/batiskaf/jinja2_ext/cart.py" />
<option value="$PROJECT_DIR$/store/urls.py" />
<option value="$PROJECT_DIR$/batiskaf/templates/jinja2/cart_detail.jinja" />
<option value="$PROJECT_DIR$/store/cart.py" />
<option value="$PROJECT_DIR$/static/js/_.js" />
<option value="$PROJECT_DIR$/batiskaf/settings.py" />
<option value="$PROJECT_DIR$/store/views.py" />
<option value="$PROJECT_DIR$/batiskaf/templates/jinja2/product.jinja" />
<option value="$PROJECT_DIR$/static/less/_.less" />
<option value="$PROJECT_DIR$/batiskaf/templates/jinja2/base.jinja" />
<option value="$PROJECT_DIR$/batiskaf/templates/jinja2/includes/category_filter.jinja" />
<option value="$PROJECT_DIR$/store/models.py" />
<option value="$PROJECT_DIR$/store/views.py" />
<option value="$PROJECT_DIR$/batiskaf/templates/jinja2/base.jinja" />
<option value="$PROJECT_DIR$/static/less/_.less" />
<option value="$PROJECT_DIR$/batiskaf/templates/jinja2/category.jinja" />
<option value="$PROJECT_DIR$/uwsgi.ini" />
<option value="$PROJECT_DIR$/.gitignore" />
<option value="$PROJECT_DIR$/store/models.py" />
<option value="$PROJECT_DIR$/batiskaf/templates/jinja2/cart_detail.jinja" />
<option value="$PROJECT_DIR$/batiskaf/templates/jinja2/index.jinja" />
<option value="$PROJECT_DIR$/batiskaf/jinja2_ext/thumbnails.py" />
<option value="$PROJECT_DIR$/batiskaf/jinja2_ext/cart.py" />
<option value="$PROJECT_DIR$/api/views.py" />
<option value="$PROJECT_DIR$/api/urls.py" />
<option value="$PROJECT_DIR$/main/views.py" />
<option value="$PROJECT_DIR$/store/admin.py" />
<option value="$PROJECT_DIR$/store/cart.py" />
<option value="$PROJECT_DIR$/store/urls.py" />
<option value="$PROJECT_DIR$/manage.py" />
</list>
</option>
</component>
@ -192,7 +218,7 @@
<option name="width" value="1680" />
<option name="height" value="976" />
</component>
<component name="ProjectLevelVcsManager" settingsEditedManually="false">
<component name="ProjectLevelVcsManager" settingsEditedManually="true">
<OptionsSetting value="true" id="Add" />
<OptionsSetting value="true" id="Remove" />
<OptionsSetting value="true" id="Checkout" />
@ -215,6 +241,8 @@
<sortByType />
</navigator>
<panes>
<pane id="Scope" />
<pane id="Scratches" />
<pane id="ProjectPane">
<subPane>
<PATH>
@ -247,24 +275,8 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="batiskaf" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="batiskaf" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="static" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
</subPane>
</pane>
<pane id="Scope" />
<pane id="Scratches" />
</panes>
</component>
<component name="PropertiesComponent">
@ -277,7 +289,7 @@
<property name="recentsLimit" value="5" />
<property name="DefaultHtmlFileTemplate" value="Html5" />
<property name="FullScreen" value="false" />
<property name="settings.editor.selected.configurable" value="com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable" />
<property name="settings.editor.selected.configurable" value="editing.templates" />
<property name="settings.editor.splitter.proportion" value="0.2" />
<property name="restartRequiresConfirmation" value="true" />
<property name="dynamic.classpath" value="false" />
@ -585,21 +597,21 @@
<frame x="0" y="23" width="1680" height="976" extended-state="6" />
<editor active="true" />
<layout>
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.22832723" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.23076923" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32983682" sideWeight="0.495116" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32867134" sideWeight="0.507326" order="2" side_tool="true" content_ui="tabs" />
<window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32967034" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Python Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32867134" sideWeight="0.495116" order="9" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="true" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32867134" sideWeight="0.492674" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32867134" sideWeight="0.495116" order="9" side_tool="false" content_ui="tabs" />
<window_info id="Grunt" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32983682" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32867134" sideWeight="0.492674" order="0" side_tool="false" content_ui="tabs" />
</layout>
<layout-to-restore>
<window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
@ -644,109 +656,6 @@
<watches-manager />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/static/bower_components/bootstrap/less/bootstrap.less">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-0.2804878">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/static/js/icheck/skins/flat/_all.css">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="2" column="15" selection-start-line="2" selection-start-column="1" selection-end-line="2" selection-end-column="15" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/static/bower_components/Bootflat/bootflat/scss/bootflat/_breadcrumb.scss">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="106" column="21" selection-start-line="106" selection-start-column="21" selection-end-line="106" selection-end-column="21" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/store/admin.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="52" column="46" selection-start-line="52" selection-start-column="46" selection-end-line="52" selection-end-column="46" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/main/views.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="3" column="41" selection-start-line="3" selection-start-column="41" selection-end-line="3" selection-end-column="41" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/../lib/python3.4/site-packages/jinja2/ext.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="426" column="33" selection-start-line="426" selection-start-column="33" selection-end-line="426" selection-end-column="33" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/../lib/python3.4/site-packages/sorl/thumbnail/templatetags/thumbnail.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.60402685">
<caret line="18" column="0" selection-start-line="18" selection-start-column="0" selection-end-line="18" selection-end-column="50" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/../lib/python3.4/site-packages/jinja2/filters.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.40268457">
<caret line="172" column="0" selection-start-line="172" selection-start-column="0" selection-end-line="172" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/myapp_models.png">
<provider selected="true" editor-type-id="images">
<state />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/../lib/python3.4/site-packages/sorl/thumbnail/base.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="144" column="42" selection-start-line="144" selection-start-column="42" selection-end-line="144" selection-end-column="42" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/../lib/python3.4/site-packages/django/db/models/lookups.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.16778524">
<caret line="13" column="12" selection-start-line="13" selection-start-column="12" selection-end-line="13" selection-end-column="12" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/../lib/python3.4/site-packages/django/db/models/sql/aggregates.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.26621923">
<caret line="65" column="17" selection-start-line="65" selection-start-column="17" selection-end-line="65" selection-end-column="17" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/../lib/python3.4/site-packages/sorl/thumbnail/shortcuts.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.23489933">
<caret line="7" column="32" selection-start-line="7" selection-start-column="32" selection-end-line="7" selection-end-column="32" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/../lib/python3.4/site-packages/django/db/models/query.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.33333334">
<caret line="294" column="0" selection-start-line="294" selection-start-column="0" selection-end-line="294" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/static/less/vendor/bootstrap/glyphicons.less">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.21276596">
<caret line="6" column="2" selection-start-line="6" selection-start-column="2" selection-end-line="6" selection-end-column="2" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/static/bower_components/bootstrap/less/glyphicons.less">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.31914893">
@ -766,13 +675,6 @@
<state />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/batiskaf/templates/jinja2/index.jinja">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-13.0">
<caret line="160" column="30" selection-start-line="160" selection-start-column="30" selection-end-line="160" selection-end-column="31" />
</state>
</provider>
</entry>
<entry file="dbDummy://dbtable:/b31df4ac/a0d744d4-223a-4a9f-89be-39d785e938c0/batiskaf.public.django_session">
<provider editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
@ -799,20 +701,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/urls.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="1" column="0" selection-start-line="1" selection-start-column="0" selection-end-line="16" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/views.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="10" column="37" selection-start-line="10" selection-start-column="37" selection-end-line="10" selection-end-column="37" />
</state>
</provider>
</entry>
<entry file="file:///usr/local/Cellar/python3/3.4.3/Frameworks/Python.framework/Versions/3.4/lib/python3.4/socketserver.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
@ -834,13 +722,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/batiskaf/urls.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="7" column="38" selection-start-line="7" selection-start-column="38" selection-end-line="7" selection-end-column="38" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/store/__init__.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
@ -848,27 +729,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/batiskaf/jinja2_ext/thumbnails.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/batiskaf/jinja2.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="14" column="30" selection-start-line="14" selection-start-column="30" selection-end-line="14" selection-end-column="30" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/store/urls.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="9" column="28" selection-start-line="9" selection-start-column="28" selection-end-line="9" selection-end-column="28" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/../lib/python3.4/site-packages/django/views/generic/base.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-1.9124087">
@ -883,34 +743,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/batiskaf/jinja2_ext/cart.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="4" column="14" selection-start-line="4" selection-start-column="14" selection-end-line="4" selection-end-column="14" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/batiskaf/templates/jinja2/cart_detail.jinja">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-8.75">
<caret line="38" column="0" selection-start-line="38" selection-start-column="0" selection-end-line="38" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/store/cart.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="24" column="32" selection-start-line="24" selection-start-column="32" selection-end-line="24" selection-end-column="32" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/batiskaf/settings.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="63" column="49" selection-start-line="63" selection-start-column="49" selection-end-line="63" selection-end-column="49" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/static/js/_.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
@ -918,16 +750,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/static/less/_.less">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="423" column="3" selection-start-line="423" selection-start-column="3" selection-end-line="423" selection-end-column="3" />
<folding>
<marker date="1432817385000" expanded="true" signature="14044:14045" placeholder="{...}" />
</folding>
</state>
</provider>
</entry>
<entry file="uml://DATABASE/a0d744d4-223a-4a9f-89be-39d785e938c0">
<provider selected="true" editor-type-id="UmlEditorProvider">
<state>
@ -1357,41 +1179,92 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/batiskaf/templates/jinja2/base.jinja">
<entry file="file://$PROJECT_DIR$/../lib/python3.4/site-packages/django/db/models/base.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="90" column="75" selection-start-line="90" selection-start-column="75" selection-end-line="90" selection-end-column="75" />
<caret line="495" column="18" selection-start-line="495" selection-start-column="18" selection-end-line="495" selection-end-column="18" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/../lib/python3.4/site-packages/django/contrib/messages/middleware.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.37951806">
<caret line="22" column="43" selection-start-line="22" selection-start-column="43" selection-end-line="22" selection-end-column="43" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/../lib/python3.4/site-packages/django/views/generic/detail.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.12650603">
<caret line="13" column="16" selection-start-line="13" selection-start-column="16" selection-end-line="13" selection-end-column="16" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/store/views.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="88" column="21" selection-start-line="88" selection-start-column="21" selection-end-line="88" selection-end-column="21" />
<folding>
<element signature="e#0#72#0" expanded="true" />
<marker date="1433164371000" expanded="true" signature="-1:-1" placeholder="SELECT MIN(p..store_productvariation..." />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/batiskaf/templates/jinja2/product.jinja">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="71" column="0" selection-start-line="71" selection-start-column="0" selection-end-line="71" selection-end-column="0" />
<caret line="80" column="0" selection-start-line="80" selection-start-column="0" selection-end-line="80" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/../lib/python3.4/site-packages/django/db/models/base.py">
<entry file="file://$PROJECT_DIR$/batiskaf/templates/jinja2/includes/category_filter.jinja">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="495" column="18" selection-start-line="495" selection-start-column="18" selection-end-line="495" selection-end-column="18" />
<caret line="14" column="41" selection-start-line="14" selection-start-column="41" selection-end-line="14" selection-end-column="41" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/../lib/python3.4/site-packages/django/contrib/messages/middleware.py">
<entry file="file://$PROJECT_DIR$/batiskaf/templates/jinja2/base.jinja">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.37951806">
<caret line="22" column="43" selection-start-line="22" selection-start-column="43" selection-end-line="22" selection-end-column="43" />
<state vertical-scroll-proportion="0.0">
<caret line="99" column="89" selection-start-line="99" selection-start-column="89" selection-end-line="99" selection-end-column="89" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/../lib/python3.4/site-packages/django/views/generic/detail.py">
<entry file="file://$PROJECT_DIR$/static/less/_.less">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.12650603">
<caret line="13" column="16" selection-start-line="13" selection-start-column="16" selection-end-line="13" selection-end-column="16" />
<state vertical-scroll-proportion="0.0">
<caret line="432" column="3" selection-start-line="432" selection-start-column="3" selection-end-line="432" selection-end-column="3" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/batiskaf/templates/jinja2/category.jinja">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="116" column="69" selection-start-line="116" selection-start-column="69" selection-end-line="116" selection-end-column="69" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/uwsgi.ini">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="11" column="19" selection-start-line="11" selection-start-column="19" selection-end-line="11" selection-end-column="19" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/.gitignore">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-0.3409091">
<caret line="3" column="0" selection-start-line="3" selection-start-column="0" selection-end-line="3" selection-end-column="0" />
<folding />
</state>
</provider>
@ -1399,34 +1272,204 @@
<entry file="file://$PROJECT_DIR$/store/models.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="196" column="39" selection-start-line="196" selection-start-column="39" selection-end-line="196" selection-end-column="39" />
<caret line="176" column="62" selection-start-line="176" selection-start-column="62" selection-end-line="176" selection-end-column="62" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/batiskaf/templates/jinja2/includes/category_filter.jinja">
<entry file="file://$PROJECT_DIR$/batiskaf/celery.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-2.5">
<caret line="14" column="41" selection-start-line="14" selection-start-column="41" selection-end-line="14" selection-end-column="41" />
<state vertical-scroll-proportion="0.0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding>
<element signature="e#0#38#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/batiskaf/jinja2.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="14" column="30" selection-start-line="14" selection-start-column="30" selection-end-line="14" selection-end-column="30" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/store/views.py">
<entry file="file://$PROJECT_DIR$/batiskaf/settings.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="79" column="69" selection-start-line="79" selection-start-column="69" selection-end-line="79" selection-end-column="69" />
<caret line="92" column="32" selection-start-line="92" selection-start-column="32" selection-end-line="92" selection-end-column="32" />
<folding>
<element signature="e#0#72#0" expanded="true" />
<marker date="1432796838000" expanded="true" signature="3198:3360" placeholder="SELECT MIN(p..store_productvariation..." />
<element signature="e#319#328#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/batiskaf/templates/jinja2/category.jinja">
<entry file="file://$PROJECT_DIR$/batiskaf/urls.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="7" column="38" selection-start-line="7" selection-start-column="38" selection-end-line="7" selection-end-column="38" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/batiskaf/wsgi.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="15" column="0" selection-start-line="15" selection-start-column="0" selection-end-line="15" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/batiskaf/templates/jinja2/cart_detail.jinja">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-12.083333">
<caret line="43" column="0" selection-start-line="43" selection-start-column="0" selection-end-line="43" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/batiskaf/templates/jinja2/index.jinja">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-11.875">
<caret line="195" column="30" selection-start-line="195" selection-start-column="30" selection-end-line="195" selection-end-column="30" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/batiskaf/jinja2_ext/thumbnails.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/batiskaf/jinja2_ext/cart.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="4" column="14" selection-start-line="4" selection-start-column="14" selection-end-line="4" selection-end-column="14" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/views.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="10" column="0" selection-start-line="10" selection-start-column="0" selection-end-line="10" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/urls.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="15" column="0" selection-start-line="15" selection-start-column="0" selection-end-line="15" selection-end-column="0" />
<folding>
<element signature="e#0#41#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/tests.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/models.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/admin.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.54389316">
<caret line="110" column="57" selection-start-line="110" selection-start-column="57" selection-end-line="110" selection-end-column="57" />
<state vertical-scroll-proportion="0.0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/__init__.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/main/views.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/main/tests.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/main/admin.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/store/admin.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding>
<element signature="e#0#32#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/store/cart.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="24" column="0" selection-start-line="24" selection-start-column="0" selection-end-line="24" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/store/urls.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="8" column="28" selection-start-line="8" selection-start-column="28" selection-end-line="8" selection-end-column="28" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/myapp_models.png">
<provider selected="true" editor-type-id="images">
<state />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/manage.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="10" column="0" selection-start-line="10" selection-start-column="0" selection-end-line="10" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/main/models.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>

BIN
api/__pycache__/__init__.cpython-34.pyc
View File

Binary file not shown.

BIN
api/__pycache__/urls.cpython-34.pyc
View File

Binary file not shown.

BIN
api/__pycache__/views.cpython-34.pyc
View File

Binary file not shown.

BIN
batiskaf/__pycache__/__init__.cpython-34.pyc
View File

Binary file not shown.

BIN
batiskaf/__pycache__/admin.cpython-34.pyc
View File

Binary file not shown.

BIN
batiskaf/__pycache__/celery.cpython-34.pyc
View File

Binary file not shown.

BIN
batiskaf/__pycache__/jinja2.cpython-34.pyc
View File

Binary file not shown.

BIN
batiskaf/__pycache__/models.cpython-34.pyc
View File

Binary file not shown.

BIN
batiskaf/__pycache__/settings.cpython-34.pyc
View File

Binary file not shown.

BIN
batiskaf/__pycache__/urls.cpython-34.pyc
View File

Binary file not shown.

BIN
batiskaf/__pycache__/wsgi.cpython-34.pyc
View File

Binary file not shown.

2
batiskaf/jinja2.py
Unescape View File

@ -2,6 +2,7 @@ from django.contrib.staticfiles.storage import staticfiles_storage
from django.core.urlresolvers import reverse
from batiskaf.jinja2_ext.thumbnails import thumbnail
from batiskaf.jinja2_ext.cart import cart
from batiskaf.jinja2_ext.html_filters import *
from jinja2 import Environment
@ -11,6 +12,7 @@ def environment(**options):
'static': staticfiles_storage.url,
'url': reverse,
})
env.filters['linebreaks'] = linebreaks
env.filters['thumbnail'] = thumbnail
env.filters['cart'] = cart
return env

BIN
batiskaf/jinja2_ext/__pycache__/__init__.cpython-34.pyc
View File

Binary file not shown.

BIN
batiskaf/jinja2_ext/__pycache__/cart.cpython-34.pyc
View File

Binary file not shown.

BIN
batiskaf/jinja2_ext/__pycache__/thumbnails.cpython-34.pyc
View File

Binary file not shown.

99
batiskaf/templates/jinja2/product.jinja
Unescape View File

@ -1,23 +1,23 @@
{% extends 'base.jinja' %}
{% block content %}
<div class=" breadcrumbs">
<ol class="breadcrumb breadcrumb-arrow">
<li><a href="/">Главная</a></li>
{% for parent in category.get_parents() %}
<li><a href="{{ parent.get_absolute_url() }}">{{ parent.title }}</a></li>
{% endfor %}
<li class=""><a href="{{ category.get_absolute_url() }}">{{ category.title }}</a></li>
<li class="active"><span>{{ product.title }}</span></li>
</ol>
</div>
<div class="row">
<div class="product-thumbnails col-xs-6">
<div class="product-min-thumbnails col-xs-2">
{% for image in product.images.all() %}
{% set im = image.image|thumbnail("80x80") %}
{% set im_big = image.image|thumbnail("398x398") %}
<a href="/static/{{ im_big.url }}" data-big-url="/static/{{ image.image.url }}"><img
src="/static/{{ im.url }}" alt="" class="img-thumbnail"/></a>
<div class=" breadcrumbs">
<ol class="breadcrumb breadcrumb-arrow">
<li><a href="/">Главная</a></li>
{% for parent in category.get_parents() %}
<li><a href="{{ parent.get_absolute_url() }}">{{ parent.title }}</a></li>
{% endfor %}
<li class=""><a href="{{ category.get_absolute_url() }}">{{ category.title }}</a></li>
<li class="active"><span>{{ product.title }}</span></li>
</ol>
</div>
<div class="row">
<div class="product-thumbnails col-xs-6">
<div class="product-min-thumbnails col-xs-2">
{% for image in product.images.all() %}
{% set im = image.image|thumbnail("80x80") %}
{% set im_big = image.image|thumbnail("398x398") %}
<a href="/static/{{ im_big.url }}" data-big-url="/static/{{ image.image.url }}"><img
src="/static/{{ im.url }}" alt="" class="img-thumbnail"/></a>
{% endfor %}
</div>
<div class="product-big-thumbnail col-xs-10">
@ -38,51 +38,54 @@
<br/>
{% set variant = product.variations.filter(in_stock__gt=0).order_by('price').first() %}
{% if not variant %}
{% set variant = product.variations.order_by('price').first() %}
{% set variant = product.variations.order_by('price').first() %}
{% endif %}
<div class="product-variations">
<p>Варианты товара:</p>
{# TODO: Предусмотреть если всего один вариант#}
<select name="product-variations-selecter" class="product-variations-selecter">
{% for variation in product.variations.order_by('price') %}
<option {% if variation.pk == variant.pk %}selected='selected'{% endif %}
value="{{ variation.pk }}" data-price="{{ variation.price }}"
data-count="{{ variation.in_stock }}">{{ variation.variation }} - {{ variation.price }}
₸
</option>
{% endfor %}
</select>
</div>
<br/>
<option {% if variation.pk == variant.pk %}selected='selected'{% endif %}
value="{{ variation.pk }}" data-price="{{ variation.price }}"
data-count="{{ variation.in_stock }}">{{ variation.variation }} - {{ variation.price }}
₸
</option>
{% endfor %}
</select>
</div>
<br/>
<div class="product-in-stock">
<select name="product-count-selecter" class="product-count-selecter">
{% for count_val in range(variant.in_stock) %}
<option value="{{ count_val + 1 }}">{{ count_val + 1 }} шт.</option>
{% endfor %}
</select>
<br/><br/><br/>
<div class="product-in-stock">
<select name="product-count-selecter" class="product-count-selecter">
{% for count_val in range(variant.in_stock) %}
<option value="{{ count_val + 1 }}">{{ count_val + 1 }} шт.</option>
{% endfor %}
</select>
<br/><br/><br/>
<div class="row">
<div class="itogo col-xs-6">
Итого: <span class="itogo-span">{{ product.min_price() }}</span> ₸
</div>
<div class="col-xs-6 text-right">
{# TODO: Сделать кнопку заказать#}
<a href="/store/cart/add/?pk={{ variant.pk }}&count=1&next={{ product.get_absolute_url() }}"
class="btn btn-warning btn-block" id="product-add-to-cart-link"><span
class="glyphicon glyphicon-shopping-cart" aria-hidden="true"></span> Добавить в корзину</a>
<div class="row">
<div class="itogo col-xs-6">
Итого: <span class="itogo-span">{{ product.min_price() }}</span> ₸
</div>
<div class="col-xs-6 text-right">
{# TODO: Сделать кнопку заказать#}
<a href="/store/cart/add/?pk={{ variant.pk }}&count=1&next={{ product.get_absolute_url() }}"
class="btn btn-warning btn-block" id="product-add-to-cart-link"><span
class="glyphicon glyphicon-shopping-cart" aria-hidden="true"></span> Добавить в корзину</a>
</div>
</div>
</div>
</div>
<div class="product-not-in-stock">
Товара нет в наличии
</div>
<div class="product-not-in-stock">
Товара нет в наличии
</div>
</div>
</div>
<div class=" text-justify product-description">
{{ product.description|linebreaks|safe }}
</div>
{% endblock %}

BIN
main/__pycache__/__init__.cpython-34.pyc
View File

Binary file not shown.

BIN
main/__pycache__/admin.cpython-34.pyc
View File

Binary file not shown.

BIN
main/__pycache__/models.cpython-34.pyc
View File

Binary file not shown.

BIN
main/__pycache__/views.cpython-34.pyc
View File

Binary file not shown.

BIN
main/migrations/__pycache__/0001_initial.cpython-34.pyc
View File

Binary file not shown.

BIN
main/migrations/__pycache__/0002_auto_20150328_1422.cpython-34.pyc
View File

Binary file not shown.

BIN
main/migrations/__pycache__/0003_auto_20150328_1428.cpython-34.pyc
View File

Binary file not shown.

BIN
main/migrations/__pycache__/0004_auto_20150328_1429.cpython-34.pyc
View File

Binary file not shown.

BIN
main/migrations/__pycache__/0005_auto_20150328_1452.cpython-34.pyc
View File

Binary file not shown.

BIN
main/migrations/__pycache__/0006_auto_20150328_1507.cpython-34.pyc
View File

Binary file not shown.

BIN
main/migrations/__pycache__/__init__.cpython-34.pyc
View File

Binary file not shown.

5
static/less/_.css
Unescape View File

@ -922,3 +922,8 @@ table.table-cart input {
ul.messages {
display: none;
}
.product-description {
margin-top: 40px;
padding-top: 20px;
border-top: 1px #ddd solid;
}

18
static/less/_.less
Unescape View File

@ -118,11 +118,11 @@ span.yellow {
* with disabling the responsiveness.
*/
/* Account for fixed navbar */
/* Account for fixed navbar */
body,
.navbar-static-top,
.navbar-fixed-bottom {
body,
.navbar-static-top,
.navbar-fixed-bottom {
min-width: 970px;
}
@ -146,8 +146,8 @@ body,
* grid system, and navbar.
*/
/* Reset the container */
.container {
/* Reset the container */
.container {
width: 970px;
max-width: none !important;
}
@ -758,4 +758,10 @@ table.table-cart {
ul.messages {
display: none;
}
.product-description{
margin-top: 40px;
padding-top: 20px;
border-top: 1px #ddd solid;
}

BIN
store/__pycache__/__init__.cpython-34.pyc
View File

Binary file not shown.

BIN
store/__pycache__/admin.cpython-34.pyc
View File

Binary file not shown.

BIN
store/__pycache__/cart.cpython-34.pyc
View File

Binary file not shown.

BIN
store/__pycache__/models.cpython-34.pyc
View File

Binary file not shown.

BIN
store/__pycache__/urls.cpython-34.pyc
View File

Binary file not shown.

BIN
store/__pycache__/views.cpython-34.pyc
View File

Binary file not shown.

BIN
store/migrations/__pycache__/0001_initial.cpython-34.pyc
View File

Binary file not shown.

BIN
store/migrations/__pycache__/0002_auto_20150329_0506.cpython-34.pyc
View File

Binary file not shown.

BIN
store/migrations/__pycache__/0003_auto_20150506_0553.cpython-34.pyc
View File

Binary file not shown.

BIN
store/migrations/__pycache__/0004_auto_20150506_1004.cpython-34.pyc
View File

Binary file not shown.

BIN
store/migrations/__pycache__/0005_auto_20150511_1617.cpython-34.pyc
View File

Binary file not shown.

BIN
store/migrations/__pycache__/0006_auto_20150514_1123.cpython-34.pyc
View File

Binary file not shown.

BIN
store/migrations/__pycache__/0007_auto_20150515_0902.cpython-34.pyc
View File

Binary file not shown.

BIN
store/migrations/__pycache__/0008_auto_20150526_1017.cpython-34.pyc
View File

Binary file not shown.

BIN
store/migrations/__pycache__/0009_auto_20150526_1021.cpython-34.pyc
View File

Binary file not shown.

BIN
store/migrations/__pycache__/__init__.cpython-34.pyc
View File

Binary file not shown.
Write Preview
Loading…
Cancel
Save