diff --git a/templates/faq/api.html.twig b/templates/faq/api.html.twig new file mode 100644 index 0000000000..6fa67c0f17 --- /dev/null +++ b/templates/faq/api.html.twig @@ -0,0 +1,18 @@ +{% extends 'faq/home.html.twig' %} + +{% block title %}Help{% endblock %} + +{% block body %} +
+ {% block markdown %} + {% apply markdown_to_html %} + ## What is this site? + This is a social network, running the GNU social software. + + You can use it to make connections between friends, family and colleagues -- writing short notices about yourself, where you are, and what you're doing, and those notices will be sent to all your contacts. + + In the future, we'll be adding support for photo, video and file sharing, as well as events, better contact management and mobile devices. + {% endapply %} + {% endblock %} +
+{% endblock %} \ No newline at end of file diff --git a/templates/faq/base.html.twig b/templates/faq/base.html.twig index 42e81098fb..a2f4e0280b 100644 --- a/templates/faq/base.html.twig +++ b/templates/faq/base.html.twig @@ -5,7 +5,6 @@ {% block title %}{% endblock %} {% block stylesheets %} -<<<<<<< HEAD {{ parent() }} @@ -13,68 +12,5 @@ {% endblock %} {% block header %}{{ parent() }}{% endblock %} -======= - - -{% endblock %} - -{% block body %} - -{% endblock %} ->>>>>>> 2ed0d2b706... [UI] FAQ sub pages and routing added, small screen css work started. {% block javascripts %}{% endblock %} diff --git a/templates/faq/contact.html.twig b/templates/faq/contact.html.twig index 69c1e65563..8e98d4f755 100644 --- a/templates/faq/contact.html.twig +++ b/templates/faq/contact.html.twig @@ -1,4 +1,4 @@ -{% extends 'faq/base.html.twig' %} +{% extends 'faq/home.html.twig' %} {% block title %}Help{% endblock %} diff --git a/templates/faq/help.html.twig b/templates/faq/help.html.twig new file mode 100644 index 0000000000..6fa67c0f17 --- /dev/null +++ b/templates/faq/help.html.twig @@ -0,0 +1,18 @@ +{% extends 'faq/home.html.twig' %} + +{% block title %}Help{% endblock %} + +{% block body %} +
+ {% block markdown %} + {% apply markdown_to_html %} + ## What is this site? + This is a social network, running the GNU social software. + + You can use it to make connections between friends, family and colleagues -- writing short notices about yourself, where you are, and what you're doing, and those notices will be sent to all your contacts. + + In the future, we'll be adding support for photo, video and file sharing, as well as events, better contact management and mobile devices. + {% endapply %} + {% endblock %} +
+{% endblock %} \ No newline at end of file diff --git a/templates/faq/home.html.twig b/templates/faq/home.html.twig deleted file mode 100644 index ab3bfc3932..0000000000 --- a/templates/faq/home.html.twig +++ /dev/null @@ -1,46 +0,0 @@ -{% extends 'faq/base.html.twig' %} - -{% block title %}FAQ{% endblock %} - -{% block body %} - {{ parent() }} - - -
- {% apply markdown_to_html %} - ## What is this site? - This is a social network, running the GNU social software. - - You can use it to make connections between friends, family and colleagues -- writing short notices about yourself, where you are, and what you're doing, and those notices will be sent to all your contacts. - - In the future, we'll be adding support for photo, video and file sharing, as well as events, better contact management and mobile devices. - {% endapply %} -
-{% endblock %} \ No newline at end of file