remotes/origin/1203
Nazar Kotjuk 10 years ago
parent db7a8f2715
commit 852443973f
  1. 5
      .gitignore
  2. 30
      templates/client/package.json
  3. 2
      templates/client/service/participation.html
  4. 2
      templates/client/service/remotely.html
  5. 2
      templates/client/service/tickets.html
  6. 2
      templates/client/service/tour.html
  7. 2
      templates/client/service/translator.html
  8. 1
      templates/client/static_client/css/vendor.css
  9. 7
      templates/client/static_client/js/_modules/block.common.js
  10. 2
      templates/client/static_client/js_min/_modules/block.common.min.js

5
.gitignore vendored

@ -4,15 +4,16 @@
*~
*.egg-info
*.doc
# jetbrains data
.idea/
media/
media
logs/
Thumbs.db
npm-debug.log
/proj/local.py
# gulp
node_modules
npm-debug.log

@ -0,0 +1,30 @@
{
"name": "kotzilla",
"version": "0.0.0",
"description": "",
"main": "gulpfile.js",
"dependencies": {
"gulp": "~3.9.0"
},
"devDependencies": {
"connect": "~3.4.0",
"gulp-concat": "~2.6.0",
"gulp-livereload": "~3.8.1",
"gulp": "~3.9.0",
"gulp-stylus": "~2.1.0",
"gulp-uglify": "~1.4.1",
"gulp-jade": "~1.1.0",
"gulp-imagemin": "~2.3.0",
"gulp-csso": "~1.0.0",
"gulp-myth": "~1.0.3",
"gulp-rename": "~1.2.2",
"gulp-autoprefixer": "~3.0.2",
"gulp-cssmin": "~0.1.7",
"gulp-newer": "~0.5.1"
},
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
},
"author": "",
"license": "BSD-2-Clause"
}

@ -55,7 +55,7 @@
</div>
<div class="rq-form service-page" {% if form.errors %}style="display:block"{% endif %}>
<form method="post">{% csrf_token %}
<form id="id_service_participation" method="post">{% csrf_token %}
<hr />

@ -58,7 +58,7 @@
</div>
<div class="rq-form service-page" {% if form.errors %}style="display:block"{% endif %}>
<form method="post">{% csrf_token %}
<form id="id_service_remote" method="post">{% csrf_token %}
<hr />

@ -51,7 +51,7 @@
</div>
<div class="rq-form service-page" {% if form.errors %}style="display:block"{% endif %}>
<form method="post">{% csrf_token %}
<form id="id_service_tickets" method="post">{% csrf_token %}
<hr />

@ -53,7 +53,7 @@
</div>
<div class="rq-form service-page" {% if form.errors %}style="display:block"{% endif %}>
<form method="post">{% csrf_token %}
<form id="id_service_tour" method="post">{% csrf_token %}
<hr />

@ -51,7 +51,7 @@
<div class="rq-form service-page" {% if form.errors %}style="display:block"{% endif %}>
{% comment %}{{ form.errors }}{% endcomment %}
<form method="post">{% csrf_token %}
<form id="id_service_translator" method="post">{% csrf_token %}
<hr />

@ -2809,4 +2809,3 @@ html[dir="rtl"] .select2-container-multi .select2-choices li
height: 100px;
overflow: scroll;
}

@ -93,7 +93,12 @@ if (EXPO.common){
$.fancybox.close(true);
$.fancybox('#'+EXPO.common.opt.successRegisterId);
}else{
if($(self.DOM).attr('id') == 'log_form'){
dataLayer.push({'event': 'logform'});
}
if($(self.DOM).attr('id') == 'end-reg-form'){
dataLayer.push({'event': 'endregform'});
}
window.location.reload();
}
}else{

File diff suppressed because one or more lines are too long
Loading…
Cancel
Save