From: François Michonneau Date: Tue, 20 Oct 2020 05:06:26 +0000 (+0200) Subject: Merge branch 'gh-pages' of github.com:carpentries/styles into gh-pages X-Git-Url: https://git.arvados.org/rnaseq-cwl-training.git/commitdiff_plain/2c6b97e57dce86830bdbde8d9f8a871c0b46a035 Merge branch 'gh-pages' of github.com:carpentries/styles into gh-pages --- 2c6b97e57dce86830bdbde8d9f8a871c0b46a035 diff --cc LICENSE.md index e537827,e6a3398..1e9e590 --- a/LICENSE.md +++ b/LICENSE.md @@@ -1,46 -1,49 +1,46 @@@ --- layout: page -title: "Licenses" +title: "Licencias" root: . --- -## Instructional Material +### Material didáctico - Todo el material de instrucción de Software Carpentry and Data Carpentry está -All Software Carpentry, Data Carpentry, and Library Carpentry instructional material is -made available under the [Creative Commons Attribution -license][cc-by-human]. The following is a human-readable summary of -(and not a substitute for) the [full legal text of the CC BY 4.0 -license][cc-by-legal]. ++Todo el material de instrucción de Software Carpentry, Data Carpentry y Library Carpentry está +disponible bajo la licencia [Creative Commons Attribution][cc-por-humano]. El siguiente es un resumen de licencia +(y no un sustituto) del [texto legal completo de CC BY 4.0 +licencia][cc-by-legal]. -You are free: +Puedes libremente: -* to **Share**---copy and redistribute the material in any medium or format -* to **Adapt**---remix, transform, and build upon the material +* **Compartir** --- copiar y redistribuir el material en cualquier medio o formato +* **Adaptar** --- remezclar, transformar y construir a partir del material -for any purpose, even commercially. +para cualquier propósito, incluso comercialmente. -The licensor cannot revoke these freedoms as long as you follow the -license terms. +El licenciante no puede revocar estas libertades mientras se siga las +condiciones de la licencia. -Under the following terms: +Bajo los siguientes términos: -* **Attribution**---You must give appropriate credit (mentioning that - your work is derived from work that is Copyright © Software - Carpentry and, where practical, linking to - http://software-carpentry.org/), provide a [link to the - license][cc-by-human], and indicate if changes were made. You may do - so in any reasonable manner, but not in any way that suggests the - licensor endorses you or your use. +* **Atribución** --- Debes otorgar crédito a éste material de manera adecuada (mencionando que +  su trabajo se deriva del trabajo que es Copyright de © Software +  Carpentry y, donde sea práctico, agrega un enlace a +  http://software-carpentry.org/), proporciona un [enlace a la -   licencia][cc-por-humano], e indica si se realizaron cambios. Puedes hacerlo en cualquier forma razonable, - pero no de forma tal que sugiera que tú o el uso del material derivado tienen el respaldo del licenciante. ++  licencia][cc-por-humano], e indica si se realizaron cambios. Puedes hacerlo en cualquier forma razonable, ++ pero no de forma tal que sugiera que tú o el uso del material derivado tienen el respaldo del licenciante. -**No additional restrictions**---You may not apply legal terms or -technological measures that legally restrict others from doing -anything the license permits. With the understanding that: +**Sin restricciones adicionales** --- No puedes aplicar términos legales o +medidas tecnológicas que restrinjan a otros hacer - todo lo que la licencia permite. ++todo lo que la licencia permite. -Notices: +Avisos: - * No tiene que cumplir con la licencia con los materiales que estén en el dominio público - o cuando su uso esté permitido por una excepción o limitación aplicable. -* You do not have to comply with the license for elements of the - material in the public domain or where your use is permitted by an - applicable exception or limitation. -* No warranties are given. The license may not give you all of the - permissions necessary for your intended use. For example, other - rights such as publicity, privacy, or moral rights may limit how you - use the material. ++* No tiene que cumplir con la licencia con los materiales que estén en el dominio público ++ o cuando su uso esté permitido por una excepción o limitación aplicable. +* No se dan garantías. La licencia puede no darle todos los +  permisos necesarios para su uso previsto. Por ejemplo, otros +  derechos como la publicidad, la privacidad, o los derechos morales pueden limitar la forma en que +  uses el material. ## Software diff --cc _includes/all_keypoints.html index 44a7d95,f0abd25..dcc25e8 --- a/_includes/all_keypoints.html +++ b/_includes/all_keypoints.html @@@ -1,9 -1,18 +1,18 @@@ {% comment %} - Display key points of all episodes for reference. + Muestra los puntos clave de todos los episodios para referencia. {% endcomment %} + + {% include base_path.html %} + {% include manual_episode_order.html %} + -

Key Points

+

Puntos Clave

- {% for episode in site.episodes %} + {% for lesson_episode in lesson_episodes %} + {% if site.episode_order %} + {% assign episode = site.episodes | where: "slug", lesson_episode | first %} + {% else %} + {% assign episode = lesson_episode %} + {% endif %} {% unless episode.break %}
diff --cc _includes/carpentries.html index 7b38087,c032bd5..087faaf --- a/_includes/carpentries.html +++ b/_includes/carpentries.html @@@ -1,33 -1,70 +1,60 @@@ {% comment %} - Descripción general de Software y Data Carpentry. - General description of Software, Data, and Library Carpentry. ++ Descripción general de Software, Data, y Library Carpentry. {% endcomment %} + + {% include base_path.html %} +
- Software Carpentry logo + The Carpentries logo
- Desde 1998, - Software Carpentry - ha estado enseñando investigadores en ciencia, ingeniería, medicina y disciplinas relacionadas las habilidades informáticas que necesitan para hacer más en menos tiempo y con menos dolor. Sus instructores voluntarios han ejecutado cientos de eventos para miles de estudiantes en los últimos dos años y medio. +

The Carpentries comprises + Software Carpentry, Data Carpentry, and Library Carpentry communities of Instructors, Trainers, + Maintainers, helpers, and supporters who share a mission to teach - foundational coding and data science skills to researchers and people ++ foundational coding and data science skills to researchers and people + working in library- and information-related roles. In January, + 2018, The Carpentries was formed by the merger of Software Carpentry and + Data Carpentry. Library Carpentry became an official Carpentries Lesson Program in November 2018.

- +

While individual lessons and workshops continue to be run under each + lesson project, The Carpentries provide overall staffing and governance, as + well as support for assessment, instructor training and mentoring. + Memberships are joint, and the Carpentries project maintains a shared Code + of Conduct. The Carpentries is a fiscally sponsored project of Community + Initiatives, a registered 501(c)3 non-profit based in California, USA.

+
+
+
+
+ Software Carpentry logo +
+
+

Since 1998, Software Carpentry has + been teaching researchers across all disciplines the foundational coding + skills they need to get more done in less time and with less pain. Its + volunteer instructors have run hundreds of events for thousands of learners + around the world. Now that all research involves some degree of + computational work, whether with big data, cloud computing, or simple task + automation, these skills are needed more than ever.


- Data Carpentry logo + Data Carpentry logo
-

Data Carpentry develops and teaches - workshops on the fundamental data skills needed to conduct research. Its - target audience is researchers who have little to no prior computational - experience, and its lessons are domain specific, building on learners' - existing knowledge to enable them to quickly apply skills learned to their - own research. Data Carpentry workshops take researchers through the entire - data life cycle.

+ Data Carpentry desarrolla y enseña talleres sobre las habilidades de datos fundamentales necesarias para realizar investigaciones. Su público objetivo son los investigadores que tienen poca o ninguna experiencia computacional previa, y sus lecciones son específicas del dominio, aprovechando el conocimiento existente de los alumnos para permitirles aplicar rápidamente las habilidades aprendidas a su propia investigación.

- Library Carpentry logo + Library Carpentry logo
-

Library Carpentry develops lessons and - teaches workshops for and with people working in library- and - information-related roles. Its goal is to create an on-ramp to empower this - community to use software and data in their own work, as well as be - advocates for and train others in efficient, effective and reproducible data - and software practices.

+ Library Carpentry es hecho por bibliotecarios para ayudar a los bibliotecarios automatizar tareas repetitivas, aburridas y propensas a errores; crear, mantener y analizar datos sostenibles y reutilizables; trabaje eficazmente con los colegas de TI y sistemas; comprender mejor el uso del software en la investigación; y mucho más. + Library Carpentry fue el ganador del 2016 + Premio de enseñanza y aprendizaje de British Library Labs.
diff --cc _includes/episode_keypoints.html index 02c212e,5c283ea..870064c --- a/_includes/episode_keypoints.html +++ b/_includes/episode_keypoints.html @@@ -1,10 -1,17 +1,17 @@@ {% comment %} - Display key points for an episode. +Muestra los puntos clave de un episodio. {% endcomment %} + + {% if page.keypoints == nil %} + {% assign episode_keypoints = include.episode_keypoints %} + {% else %} + {% assign episode_keypoints = page.keypoints %} + {% endif %} +
-

Key Points

+

Puntos Clave

    - {% for keypoint in page.keypoints %} + {% for keypoint in episode_keypoints %}
  • {{ keypoint|markdownify }}
    • {% endfor %}
diff --cc _includes/episode_navbar.html index 130a4f9,5abf86f..625407e --- a/_includes/episode_navbar.html +++ b/_includes/episode_navbar.html @@@ -1,6 -1,20 +1,18 @@@ {% comment %} +Barra de navegación para un episodio. ++======= + For some reason, the relative_root_path seems out of scope in this file, so we + need to re-assign it here {% endcomment %} + + {% include base_path.html %} + -{% comment %} - Navigation bar for an episode. -{% endcomment %} - + {% include manual_episode_order.html %} + {% comment %} + 'previous_episode' and 'next_episodes' are defined in 'manual_episode_order.html'. + These replace 'page.previous' and 'page.next' objects, correspondingly. + {% endcomment %} +

@@@ -18,10 -32,10 +30,10 @@@

- {% if page.next.url %} - siguiente episodio + {% if next_episode %} - next episode ++ siguiente episodio {% else %} - casa de lección - lesson home ++ case de lección {% endif %}

diff --cc _includes/episode_overview.html index 85261e0,169ab26..8c273ac --- a/_includes/episode_overview.html +++ b/_includes/episode_overview.html @@@ -1,19 -1,59 +1,59 @@@ {% comment %} - Display episode's timings and learning objectives. +Muestre los tiempos y los objetivos de aprendizaje de un episodio. + + Regarding the `if page.*** == nil` below: + all-in-one page combines all episodes into one. + It, therefore, does not define its own objectives, exercises, + and questions, which 'normal' episodes define in the front matter. + + To display episodes' teaching and exercise times, as well as episode + questions and objectives, we pass them as parameters to the Liquid's + `include` statement when we generate the page: + + include episode_overview.html teaching_time=e.teaching ... + + Here we obtain the information we need either from the episode itself or + from the parameters passed in. {% endcomment %} + + {% if page.teaching == nil %} + {% assign teaching_time = include.teaching_time %} + {% else %} + {% assign teaching_time = page.teaching %} + {% endif %} + + {% if page.exercises == nil %} + {% assign exercise_time = include.exercise_time %} + {% else %} + {% assign exercise_time = page.exercises %} + {% endif %} + + {% if page.questions == nil %} + {% assign episode_questions = include.episode_questions %} + {% else %} + {% assign episode_questions = page.questions %} + {% endif %} + + {% if page.objectives == nil %} + {% assign episode_objectives = include.episode_objectives %} + {% else %} + {% assign episode_objectives = page.objectives %} + {% endif %} + +
-

Overview

+

Hoja de ruta

- Leccion: {{ page.teaching }} min - Teaching: {{ teaching_time }} min ++ Leccion: {{ teaching_time }} min
- Prácticas: {{ page.exercises }} min - Exercises: {{ exercise_time }} min ++ Prácticas: {{ exercise_time }} min
- Questions + Preguntas
    - {% for question in page.questions %} + {% for question in episode_questions %}
  • {{ question|markdownify }}
    • {% endfor %}
@@@ -24,9 -64,9 +64,9 @@@
- Objectives + Objetivos
    - {% for objective in page.objectives %} + {% for objective in episode_objectives %}
  • {{ objective|markdownify }}
    • {% endfor %}
diff --cc _includes/javascript.html index 35e6f2a,fcc74e6..2fb9659 --- a/_includes/javascript.html +++ b/_includes/javascript.html @@@ -1,9 -1,9 +1,9 @@@ {% comment %} - JavaScript used in lesson and workshop pages. +Javascript utilizado en las páginas de lecciones y talleres. {% endcomment %} - - - + + +