diff --git a/remarkbox/templates/namespace-settings.j2 b/remarkbox/templates/namespace-settings.j2 index 38dab30..0e138b4 100644 --- a/remarkbox/templates/namespace-settings.j2 +++ b/remarkbox/templates/namespace-settings.j2 @@ -31,7 +31,7 @@

- +

diff --git a/remarkbox/templates/show-node.j2 b/remarkbox/templates/show-node.j2 index 2d90e3c..4943387 100644 --- a/remarkbox/templates/show-node.j2 +++ b/remarkbox/templates/show-node.j2 @@ -181,7 +181,7 @@ {% if request.namespace.no_nodes_text %} {{ request.namespace.no_nodes_text }} {% else %} -Leave a comment to get the conversation going! +Leave first comment to start a conversation! {% endif %} {% endif %} diff --git a/remarkbox/templates/show-node2.j2 b/remarkbox/templates/show-node2.j2 deleted file mode 100644 index c0bb141..0000000 --- a/remarkbox/templates/show-node2.j2 +++ /dev/null @@ -1,146 +0,0 @@ -{% extends request.base_template -%} - -{% import 'snippets/forms.j2' as forms with context %} - -{% block title %}{% if request.node.title is not none %}{{ request.node.title }} | {% endif %}{{ request.domain }}{% endblock -%} - -{% block call_to_action %} -{% if request.node.is_root and request.user.authenticated %} - {% if request.user.get_watcher_by_node_id(request.node.id) %} - {{ snippets.unwatch_node(node_id = request.node.id) }} - {% else%} - {{ snippets.watch_node(node_id = request.node.id) }} - {% endif %} - - {% if request.node.root.namespace.is_moderator(request.user) %} - {% if request.node.locked %} - {{ snippets.unlock_node(node_id = request.node.id) }} - {% else%} - {{ snippets.lock_node(node_id = request.node.id) }} - {% endif %} - {% endif %} -{% endif %} - -{%- if request.user.authenticated and request.mode == "embed" %} - - {{ snippets.user_avatar_link(request.user, 35, class="avatar-nav") }} - -{% else %} - join-or-log-in -{%- endif %} - - -{% endblock %} - -{% block content -%} - - -{% if request.mode != "embed" and request.node.root.uri %} -Topic: {{ request.node.root.uri.data }} -{% endif %} - - -{% if request.node.has_uri == false %} - -{% if request.node.title is not none %} -

{{ request.node.title }}

-{% endif %} - - -
- {{ snippets.node_avatar_link(request.node) }} - {{ snippets.author_and_date(request.node) }} - {{ snippets.status(request.node) }} - -
- {% if not request.namespace.can_see_node(request.node, request.user) %} -

{{ snippets.status(request.node) }}

- {% else %} - {{ request.node.data_html | safe }} - {% endif %} -
- - {% if not request.node.is_root %} - - root - - {% endif %} - -
- {{ snippets.actions(request.node) }} -
- -
-{% endif %} - -
- {{ forms.edit(request.node) }} -
- -
- {{ forms.reply(request.node, request.root) }} -
- -{#- prevent DetachedInstanceError from iterating over node not in database. #} -{%- if request.node.id and request.node_graph[request.node.id] -%} - -{%- for node_id in request.node_flat_graph -%} - - {% set node = request.node_id_map[node_id] %} - - {%- if request.namespace.can_see_node(node, request.user) or (request.namespace.hide_unless_approved and node.approved) %} - - {%- if node.depth == 1 %} - {%- set avatar_size = request.avatar_size -%} - {%- else -%} - {%- set avatar_size = request.avatar_size * 0.75 -%} - {%- endif -%} - - -
- - {{ snippets.node_avatar_link(node, size=avatar_size) }} - {{ snippets.author_and_date(node) }} - {{ snippets.status(node) }} - -
- {%- if not request.namespace.can_see_node(node, request.user) %} -

{{ snippets.status(node) }}

- {%- else %} - {{ node.data_html | safe }} - {%- endif %} -
- -
- {{ snippets.permalinks(node, node) }} - {{ snippets.actions(node) }} - {{ snippets.button_collapse(node) }} -
- -
- {{ forms.edit(node) }} -
- -
- {{ forms.reply(node, request.root) }} -
- - {# close the class="node" div #} -
- - {%- endif -%} -{%- endfor -%} - -{%- else -%} -
-
-
-{% if request.namespace.no_nodes_text %} -{{ request.namespace.no_nodes_text }} -{% else %} -Leave a comment to get the conversation going! -{% endif %} -
-{% endif %} - -{% endblock %}