editorial-autogestiva-jekyll-theme 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f1b7519a87624f81c67bba20aa4dff257d422d019a061edd63ecd05dd30a4ad9
-  data.tar.gz: 7671e7b59c8cedddd5af15793732669504032aa0b6ee6ce3a6753173fc734ac7
+  metadata.gz: d869ce07c203867e7cafc72684ae44028971c711bd59c86e010fd1dec968795c
+  data.tar.gz: 6ce03db92629e293a07ba10583a274de9ad1814fa2ce8f94e0aa576cfa72cd06
 SHA512:
-  metadata.gz: 562381dff40ce0c3f2f8764c26c2b72069de18469901e6bd952dcf1ee365c4ad02ed3535d79adde5eb7ca0c09ea177256f74943b62f5449bb1be14c81d937091
-  data.tar.gz: c65fdc8fbf0cadc937338c46e08e5f2bd79b1e26d75ed4a00f8571c4984f3bd6d9d5276d5f2f046f1f3ec43a753e20fc595ad3233723e6741516ceb6c0afd256
+  metadata.gz: b4b10eb19d000565eb3521ce5a3d4de55068f8bfe1087b9adbcd3951189cfd07319096c5921ef7afeed4acba4a36dcc104e2f32c2c6d271c7d06ef8d786b5338
+  data.tar.gz: 1ab785ab4ff7ebc973fc3d36a043767709dc623a912c305286f3e28b3a3cadcd0f0a60d306ed6dadf8f7b173309fb372244b8fe055d256cc09a763f6e98b0de1

data/README.md.orig

@@ -0,0 +1,118 @@
+# editorial-autogestiva-jekyll-theme
+
+Una plantilla para editoriales autogestivas
+
+
+<<<<<<< HEAD
+## Installation
+
+Install Bootstrap 4.4:
+=======
+```bash
+# Hacer un fork local desde sutty-base-jekyll-theme a nuestra plantilla
+git clone https://0xacab.org/sutty/jekyll/sutty-base-jekyll-theme.git \
+  CAMBIAME-jekyll-theme
+cd CAMBIAME-jekyll-theme
+
+# Sutty-base ahora es el proyecto base, desde el que podemos tomar
+# cambios, pero no enviamos para no mezclar las cosas
+git remote rename origin upstream
+
+# Agregamos el repositorio donde vamos a enviar y publicar cambios
+git remote add origin \
+  git@0xacab.org:sutty/jekyll/CAMBIAME-jekyll-theme.git
+
+# Configuramos git para que envíe siempre los cambios al repositorio
+# nuevo
+git push --set-upstream origin master
+```
+
+Para empezar, hay que buscar y reemplazar en todos los archivos donde
+diga `CAMBIAME`.
+
+También hay que instalar las dependencias de CSS y JS con `yarn`.
+
+## Publicación
+
+Para publicar la plantilla, primero hay que cambiar el nombre al archivo
+`sutty-base-jekyll-theme.gemspec`:
+
+```bash
+git mv {sutty-base,CAMBIAME}-jekyll-theme.gemspec
+```
+
+Cada vez que actualicemos la gema hay que editar
+`CAMBIAME-jekyll-theme.gemspec` para cambiar la versión.
+
+Y luego para compilar y publicar la gema:
+
+```bash
+gem build CAMBIAME-jekyll-theme.gemspec
+gem push CAMBIAME-VERSION.gemspec
+```
+
+También hay que actualizar la versión en el
+[skel](https://0xacab.org/sutty/skel.sutty.nl/).
+
+>>>>>>> ab27eaaed5357d624edd12ea22bc4e88401b5a1d
+
+```bash
+yarn add bootstrap@~4.4
+```
+
+Add this line to your Jekyll site's `Gemfile`:
+
+```ruby
+gem "editorial-autogestiva-jekyll-theme"
+```
+
+And add this line to your Jekyll site's `_config.yml`:
+
+```yaml
+theme: editorial-autogestiva-jekyll-theme
+```
+
+And then execute:
+
+    $ bundle
+
+Or install it yourself as:
+
+    $ gem install editorial-autogestiva-jekyll-theme
+
+## Usage
+
+Por ahora no tenemos opciones, solo hay que agregar la gema en el sitio
+y funciona :)
+
+## Contributing
+
+Bug reports and pull requests are welcome on 0xacab.org at
+https://0xacab.org/sutty/jekyll/editorial-autogestiva-jekyll-theme. This project is
+intended to be a safe, welcoming space for collaboration, and
+contributors are expected to adhere to the [Sutty's code of
+conduct](http://sutty.nl/en/code-of-conduct).
+
+## Development
+
+To set up your environment to develop this theme, run `bundle install`.
+
+Your theme is setup just like a normal Jekyll site! To test your theme,
+run `bundle exec jekyll serve` and open your browser at
+`http://localhost:4000`. This starts a Jekyll server using your
+theme. Add pages, documents, data, etc. like normal to test your theme's
+contents. As you make modifications to your theme and to your content,
+your site will regenerate and you should see the changes in the browser
+after a refresh, just like normal.
+
+When your theme is released, only the files in `_layouts`, `_includes`,
+`_sass` and `assets` tracked with Git will be bundled.
+
+To add a custom directory to your theme-gem, please edit the array in
+`editorial-autogestiva-jekyll-theme.gemspec` accordingly.
+
+## License
+
+The theme is available as open source under the terms of the [Antifacist
+MIT License](LICENSE.txt).
+

data/_data/en.yml

@@ -0,0 +1,49 @@
+---
+locale: English
+date: '%m/%d/%Y'
+menu:
+  title: Main Menu
+  items:
+    - text: Catalogue
+      url: ''
+    - text: About
+      url: '{{ editorial.url }}'
+book:
+  pages: "Pages"
+  size: "Size"
+  availability: "Availability"
+  in_stock: "En stock"
+  out_of_stock: "Agotado temporalmente"
+  payment_methods: "Métodos de pago"
+  delivery_methods: "Métodos de entrega"
+  payment_url: "Comprar"
+  file: "Descargar"
+  direct_download:
+    schema: DirectDownload
+    text: Descarga
+  pick_up:
+    schema: PickUp
+    text: Retiro en domicilio
+  mail:
+    schema: Mail
+    text: Envío por correo
+  cash:
+    schema: Cash
+    text: Efectivo
+  direct_debit:
+    schema: DirectDebit
+    text: Débito
+  bank_transfer_in_advance:
+    schema: BankTransferInAdvance
+    text: Transferencia bancaria
+footer:
+  made_with_sutty: |
+    Sitio hecho con [Sutty](https://sutty.nl/es/). [Publicá el tuyo
+    :)](https://panel.sutty.nl/).
+  links:
+  - text: "Política de privacidad"
+    url: "politica-de-privacidad/"
+  - text: "Código de conducta"
+    url: "codigo-de-conducta/"
+contact:
+  thanks: thanks

data/_data/forms/contacto.yml

@@ -0,0 +1,49 @@
+---
+redirect:
+  type: "hidden"
+  value: ""
+pronouns:
+  type: "string"
+  autocomplete: "sex"
+  label:
+    es: "Pronombres"
+    en: "Pronouns"
+  placeholder:
+    es: "¿Qué pronombres usás?"
+    en: "What are your pronouns?"
+name:
+  type: "string"
+  autocomplete: "name"
+  label:
+    es: "Nombre"
+    en: "Name"
+  placeholder:
+    es: "Nombre elegido, pseudónimo, alias"
+    en: "Choosen name, pseudonym, alias"
+from:
+  type: "email"
+  autocomplete: "email"
+  label:
+    es: "Correo electrónico"
+    en: "E-mail address"
+contact:
+  type: "string"
+  autocomplete: "street-address"
+  label:
+    es: "Dirección de envío / Otra forma de contacto"
+    en: "Shipping address / Other contact info"
+body:
+  type: text
+  label:
+    es: Mensaje
+    en: Message
+consent:
+  type: boolean
+  label:
+    es: Acepto las políticas de privacidad
+    en: I agree to the privacy policy
+submit:
+  type: submit
+  label:
+    es: Enviar
+    en: Send

data/_data/forms/contacto.yml~

@@ -0,0 +1,45 @@
+---
+pronouns:
+  type: "string"
+  autocomplete: "sex"
+  label:
+    es: "Pronombres"
+    en: "Pronouns"
+  placeholder:
+    es: "¿Qué pronombres usás?"
+    en: "What are your pronouns?"
+name:
+  type: "string"
+  autocomplete: "name"
+  label:
+    es: "Nombre"
+    en: "Name"
+  placeholder:
+    es: "Nombre elegido, pseudónimo, alias"
+    en: "Choosen name, pseudonym, alias"
+from:
+  type: "email"
+  autocomplete: "email"
+  label:
+    es: "Correo electrónico"
+    en: "E-mail address"
+contact:
+  type: "street-address"
+  label:
+    es: "Dirección de envío / Otra forma de contacto"
+    en: "Shipping address / Other contact info"
+body:
+  type: text
+  label:
+    es: Mensaje
+    en: Message
+consent:
+  type: boolean
+  label:
+    es: Acepto las políticas de privacidad
+    en: I agree to the privacy policy
+submit:
+  type: submit
+  label:
+    es: Enviar
+    en: Send

data/_includes/boolean.html

@@ -0,0 +1 @@
+_includes/form/boolean.html

data/_includes/contact.html

@@ -1,34 +1,21 @@
-<form method="post" action="https://api.sutty.nl/v1/sites/{{ site.hostname }}/contact">
-  <input
-    type="hidden"
-    name="redirect"
-    value="{{ site.url }}/{{ include.url }}?{{ site.i18n.contact.thanks }}" />
+{% comment %}
+  Esta imagen obtiene una cookie desde la API de Sutty para autorizar el
+  envío del formulario.
+{% endcomment %}
+<img class="d-none" src="https://api.sutty.nl/v1/sites/{{ site.hostname }}/contact/cookie.png" />
 
-  {%- for field in site.i18n.contact.form.fields -%}
-    <div class="form-group">
-      <label for="pronouns">{{ field.label }}</label>
-      <input
-        type="{{ field.type }}"
-        id="{{ field.name }}"
-        name="{{ field.name }}"
-        value=""
-        class="form-control"
-        autocomplete="{{ field.autocomplete }}"
-        placeholder="{{ field.placeholder }}" />
+{% comment %}
+  El formulario se envía a la API.  La definición del formulario se
+  encuentra en _data/forms/contacto.yml
+{% endcomment %}
+<form action="https://api.sutty.nl/v1/sites/{{ site.hostname }}/contact/contacto"
+      method="post">
+  {%- for field in include.form -%}
+    {% assign template = field[1].type | append: '.html' %}
+    <div class="col{{ field[1].col | default: 12 | prepend: '-' }}">
+      {% include {{ template }} field=field %}
     </div>
   {%- endfor -%}
 
-  <div class="form-group">
-    <label for="body">{{ site.i18n.contact.form.body }}</label>
-    <textarea name="body" id="body" required class="form-control"></textarea>
-  </div>
-
-  <input type="submit" class="btn btn-success" value="{{ site.i18n.contact.form.submit }}" />
-
-  <div class="form-check form-check-inline">
-    <input type="checkbox" name="gdpr" id="gdpr" value="1" required class="form-check-input" />
-    <label class="form-check-label" for="gdpr">
-      {{ site.i18n.contact.form.gdpr }}
-    </label>
-  </div>
+  <input type="hidden" name="redirect" value="{{ site.url }}{{ include.url }}" />
 </form>

data/_includes/contact.html.orig

@@ -0,0 +1,55 @@
+<<<<<<< HEAD
+<form method="post" action="https://api.sutty.nl/v1/sites/{{ site.hostname }}/contact">
+  <input
+    type="hidden"
+    name="redirect"
+    value="{{ site.url }}/{{ include.url }}?{{ site.i18n.contact.thanks }}" />
+
+  {%- for field in site.i18n.contact.form.fields -%}
+    <div class="form-group">
+      <label for="pronouns">{{ field.label }}</label>
+      <input
+        type="{{ field.type }}"
+        id="{{ field.name }}"
+        name="{{ field.name }}"
+        value=""
+        class="form-control"
+        autocomplete="{{ field.autocomplete }}"
+        placeholder="{{ field.placeholder }}" />
+    </div>
+  {%- endfor -%}
+
+  <div class="form-group">
+    <label for="body">{{ site.i18n.contact.form.body }}</label>
+    <textarea name="body" id="body" required class="form-control"></textarea>
+  </div>
+
+  <input type="submit" class="btn btn-success" value="{{ site.i18n.contact.form.submit }}" />
+
+  <div class="form-check form-check-inline">
+    <input type="checkbox" name="gdpr" id="gdpr" value="1" required class="form-check-input" />
+    <label class="form-check-label" for="gdpr">
+      {{ site.i18n.contact.form.gdpr }}
+    </label>
+  </div>
+=======
+{% comment %}
+  Esta imagen obtiene una cookie desde la API de Sutty para autorizar el
+  envío del formulario.
+{% endcomment %}
+<img class="d-none" src="https://api.sutty.nl/v1/sites/{{ site.hostname }}/contact/cookie.png" />
+
+{% comment %}
+  El formulario se envía a la API.  La definición del formulario se
+  encuentra en _data/forms/contacto.yml
+{% endcomment %}
+<form action="https://api.sutty.nl/v1/sites/{{ site.hostname }}/contact/contacto"
+      method="post">
+  {%- for field in include.form -%}
+    {% assign template = field[1].type | append: '.html' %}
+    <div class="col{{ field[1].col | default: 12 | prepend: '-' }}">
+      {% include {{ template }} field=field %}
+    </div>
+  {%- endfor -%}
+>>>>>>> 5a59db7503af04fa49254c23ebacc03f2ee99de3
+</form>

data/_includes/email.html

@@ -0,0 +1 @@
+_includes/form/email.html

data/_includes/form/boolean.html

@@ -0,0 +1,30 @@
+{%- assign name = include.field[0] -%}
+{%- assign id = include.field[1].id | default: name -%}
+{%- assign label = include.field[1].label[site.locale] -%}
+{%- assign help = include.field[1].help[site.locale] -%}
+{%- assign autocomplete = include.field[1].autocomplete -%}
+
+<div class="form-check text-left">
+  <input
+    {% if help %}
+      aria-describedby="help-{{ id }}"
+    {% endif %}
+    {% if include.field[1].required %}
+      required
+    {% endif %}
+    type="checkbox"
+    name="{{ name }}"
+    id="{{ id }}"
+    {% if autocomplete %}
+      autocomplete="{{ autocomplete }}"
+    {% endif %}
+    class="form-check-input" />
+
+  <label class="form-check-label" for="{{ id }}">{{ label }}</label>
+
+  {%- if help -%}
+    <small id="help-{{ id }}" class="form-text">
+      {{ help }}
+    </small>
+  {%- endif -%}
+</div>

data/_includes/form/email.html

@@ -0,0 +1 @@
+{% include input.html field=field %}

data/_includes/form/hidden.html

@@ -0,0 +1,5 @@
+{%- assign name = include.field[0] -%}
+{%- assign id = include.field[1].id | default: name -%}
+{%- assign value = include.field[1].value -%}
+
+<input type="hidden" value="{{ value }}" name="{{ name }}" id="{{ id }}" />

data/_includes/form/input.html

@@ -0,0 +1,33 @@
+{%- assign name = include.field[0] -%}
+{%- assign id = include.field[1].id | default: name -%}
+{%- assign label = include.field[1].label[site.locale] -%}
+{%- assign help = include.field[1].help[site.locale] -%}
+{%- assign autocomplete = include.field[1].autocomplete -%}
+
+<div class="form-group">
+  <label for="{{ id }}">
+    {{ label }}
+    {% if include.field[1].required %}*{% endif %}
+  </label>
+
+  <input
+    {% if help %}
+      aria-describedby="help-{{ id }}"
+    {% endif %}
+    {% if include.field[1].required %}
+      required
+    {% endif %}
+    type="{{ include.field[1].type }}"
+    name="{{ name }}"
+    id="{{ id }}"
+    {% if autocomplete %}
+      autocomplete="{{ autocomplete }}"
+    {% endif %}
+    class="form-control" />
+
+  {%- if help -%}
+    <small id="help-{{ id }}" class="form-text">
+      {{ help }}
+    </small>
+  {%- endif -%}
+</div>

data/_includes/form/number.html

@@ -0,0 +1 @@
+{% include input.html field=field %}

data/_includes/form/predefined_array.html

@@ -0,0 +1,39 @@
+{%- assign name = include.field[0] -%}
+{%- assign id = include.field[1].id | default: name -%}
+{%- assign label = include.field[1].label[site.locale] -%}
+{%- assign help = include.field[1].help[site.locale] -%}
+{%- assign autocomplete = include.field[1].autocomplete -%}
+
+<div class="form-group">
+  <label for="{{ id }}">
+    {{ label }}
+    {% if include.field[1].required %}*{% endif %}
+  </label>
+
+  <select
+    {% if help %}
+      aria-describedby="help-{{ id }}"
+    {% endif %}
+    {% if include.field[1].required %}
+      required
+    {% endif %}
+    name="{{ name }}"
+    id="{{ id }}"
+    {% if autocomplete %}
+      autocomplete="{{ autocomplete }}"
+    {% endif %}
+    class="form-control">
+
+    <option value="" selected></option>
+
+    {%- for option in include.field[1].values -%}
+      <option value="{{ option }}">{{ option }}</option>
+    {%- endfor -%}
+  </select>
+
+  {%- if help -%}
+    <small id="help-{{ id }}" class="form-text">
+      {{ help }}
+    </small>
+  {%- endif -%}
+</div>

data/_includes/form/section.html

@@ -0,0 +1 @@
+<h2 id="{{ include.field[0] }}">{{ include.field[1].title }}</h2>

data/_includes/form/separator.html

@@ -0,0 +1 @@
+<hr/>

data/_includes/form/string.html

@@ -0,0 +1,3 @@
+{% assign f = field %}
+{% assign f.type = 'text' %}
+{% include input.html field=f %}

data/_includes/form/submit.html

@@ -0,0 +1 @@
+<input type="submit" class="btn btn-success" value="{{ include.field[1].label[site.locale] }}" />

data/_includes/form/text.html

@@ -0,0 +1,32 @@
+{%- assign name = include.field[0] -%}
+{%- assign id = include.field[1].id | default: name -%}
+{%- assign label = include.field[1].label[site.locale] -%}
+{%- assign help = include.field[1].help[site.locale] -%}
+{%- assign autocomplete = include.field[1].autocomplete -%}
+
+<div class="form-group">
+  <label for="{{ id }}">
+    {% if include.field[1].required %}*{% endif %}
+    {{ label }}
+  </label>
+
+  <textarea
+    {% if help %}
+      aria-describedby="help-{{ id }}"
+    {% endif %}
+    {% if include.field[1].required %}
+      required
+    {% endif %}
+    name="{{ name }}"
+    id="{{ id }}"
+    {% if autocomplete %}
+      autocomplete="{{ autocomplete }}"
+    {% endif %}
+    class="form-control"></textarea>
+
+  {%- if .help -%}
+    <small id="help-{{ id }}" class="form-text">
+      {{ help }}
+    </small>
+  {%- endif -%}
+</div>

data/_includes/form/url.html

@@ -0,0 +1 @@
+{% include input.html field=field %}

data/_includes/hidden.html

@@ -0,0 +1 @@
+_includes/form/hidden.html

data/_includes/input.html

@@ -0,0 +1 @@
+_includes/form/input.html

data/_includes/navbar.html

@@ -25,7 +25,7 @@
             <span class="sr-only">
               {{ site.i18n.menu.active | default: '(current)' }}
             </span>
-          {%- endif %}
+          {%- endif -%}
         </a>
       </li>
     {%- endfor -%}

data/_includes/navbar.html.orig

@@ -0,0 +1,44 @@
+{% assign editorial = site.posts | where: 'layout', 'editorial' | first %}
+
+<nav class="navbar navbar-expand-lg navbar-light bg-light d-print-block" role="navigation" aria-label="{{ site.i18n.menu.title }}">
+  <a class="navbar-brand" href="">
+<<<<<<< HEAD
+    {{ site.title }}
+=======
+    {% include_cached logo.html %}
+>>>>>>> ab27eaaed5357d624edd12ea22bc4e88401b5a1d
+  </a>
+
+  {% comment %}
+    TODO: Add CSS-only hamburger menu.
+  {% endcomment %}
+  <ul class="navbar-nav d-print-none">
+    {%- for item in site.i18n.menu.items -%}
+      {% comment %}
+        This makes it hard to just cache the whole navbar, but we prefer
+        to mark the active item in code rather than with JS.
+      {% endcomment %}
+
+      {% assign url = item.url | liquify %}
+
+      <li class="nav-item">
+<<<<<<< HEAD
+        <a class="nav-link{% if page.url == url %} active{% endif %}" href="{{ url }}">
+          {{ item.text }}
+
+          {%- if page.url == url -%}
+=======
+        <a class="nav-link{% if page.url == item.href %} active{% endif %}" href="{{ item.href }}">
+          {{ item.title }}
+
+          {%- if page.url == item.href -%}
+>>>>>>> ab27eaaed5357d624edd12ea22bc4e88401b5a1d
+            <span class="sr-only">
+              {{ site.i18n.menu.active | default: '(current)' }}
+            </span>
+          {%- endif -%}
+        </a>
+      </li>
+    {%- endfor -%}
+  </ul>
+</nav>

data/_includes/number.html

@@ -0,0 +1 @@
+_includes/form/number.html

data/_includes/predefined_array.html

@@ -0,0 +1 @@
+_includes/form/predefined_array.html

data/_includes/section.html

@@ -0,0 +1 @@
+_includes/form/section.html

data/_includes/separator.html

@@ -0,0 +1 @@
+_includes/form/separator.html

data/_includes/string.html

@@ -0,0 +1 @@
+_includes/form/string.html

data/_includes/submit.html

@@ -0,0 +1 @@
+_includes/form/submit.html

data/_includes/text.html

@@ -0,0 +1 @@
+_includes/form/text.html

data/_includes/url.html

@@ -0,0 +1 @@
+_includes/form/url.html

data/_layouts/book.html

@@ -125,7 +125,7 @@ layout: default
 
   <div class="row">
     <div class="col">
-      {% include contact.html url=page.url %}
+      {% include contact.html form=site.data.forms.contacto url=page.url %}
     </div>
   </div>
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: editorial-autogestiva-jekyll-theme
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - f
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-13 00:00:00.000000000 Z
+date: 2020-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -175,14 +175,44 @@ extra_rdoc_files:
 files:
 - LICENSE.txt
 - README.md
+- README.md.orig
+- _data/en.yml
 - _data/es.yml
+- _data/forms/contacto.yml
+- _data/forms/contacto.yml~
 - _data/layouts/book.yml
 - _data/layouts/editorial.yml
 - _data/layouts/post.yml
+- _includes/boolean.html
 - _includes/contact.html
+- _includes/contact.html.orig
 - _includes/editorial.html
+- _includes/email.html
 - _includes/footer.html
+- _includes/form/boolean.html
+- _includes/form/email.html
+- _includes/form/hidden.html
+- _includes/form/input.html
+- _includes/form/number.html
+- _includes/form/predefined_array.html
+- _includes/form/section.html
+- _includes/form/separator.html
+- _includes/form/string.html
+- _includes/form/submit.html
+- _includes/form/text.html
+- _includes/form/url.html
+- _includes/hidden.html
+- _includes/input.html
 - _includes/navbar.html
+- _includes/navbar.html.orig
+- _includes/number.html
+- _includes/predefined_array.html
+- _includes/section.html
+- _includes/separator.html
+- _includes/string.html
+- _includes/submit.html
+- _includes/text.html
+- _includes/url.html
 - _layouts/book.html
 - _layouts/default.html
 - _layouts/editorial.html