Merge branch 'release-0.14' into debian-release-0.14

[snf-cloudcms] / cloudcmsguide / templates / cloudcmsguide / detail.html

diff --git a/cloudcmsguide/templates/cloudcmsguide/detail.html b/cloudcmsguide/templates/cloudcmsguide/detail.html
index c420732..e5fffcc 100644 (file)
--- a/cloudcmsguide/templates/cloudcmsguide/detail.html
+++ b/cloudcmsguide/templates/cloudcmsguide/detail.html
@@ -1,19 +1,81 @@
-{% load applicationcontent_tags i18n %}
+{% load applicationcontent_tags pagination_tags i18n cloudcms_tags %}
 
-{% fragment request "sidecol" %}
-{% include "cloudcmsguide/archive.html" %}
-{% endfragment %}
+<div class="two-cols lt-small clearfix details faq">
+       <div class="rt">
+               <div class="question details {{ entry.service.class_name }}">
+                   <h2>{{ entry.title|upper }}</h2>
+                   <div class="content">
+                       {% for content in entry.content.main %}
+                           {{ content.render }}
+                       {% endfor %}
+                   </div>
+                   <div class="clearfix next-prev">
+               {% if entry.get_next %}
+                       <a href="{{ entry.get_next.get_absolute_url }}" class="next">Next ></a>         
+               {% endif %} 
+               {% if entry.get_previous %}
+                       <a href="{{ entry.get_previous.get_absolute_url }}" class="prev">< Previous</a>
+               {% else %}
+                       <a href="{{ entry.back_url }}">{% trans "&lt; Back to User Guide" %}</a>
+               {% endif%}
+                       
+                   </div>
+               </div>
+               {% comment %} 
+               <div class="extra-menu">
+                       {% for service in services %}
+                               {% if service == entry.service %}
+                               <div class="faq-category {{ service.class_name }}">                              
+                                               <h3>{{ service.translation.title_userguide|upper }}</h3>
+                                               {% if category == entry.category %}
+                                                  
+                                     <ul>
+                                          {% for e in service.userguideentries.active %}
+                                         <li {% if e = entry %}class="current"{% endif %}>
+                                            <a href="{{ e.get_absolute_url }}"> {{ e.title }} </a> 
+                                         </li>
+                                         {% endfor %}
+                                         
+                                     </ul>
+                                  {% endif %}
+                                 
+                               </div>
+                               {% endif %}
+                       {% endfor %}
+               </div>
+               {% endcomment %}
+       </div>
+        
+       <div class="lt">
+               {% for service in services %}
+                       {% if service.get_first_entry %}
+                       <div class="faq-category {{ service.class_name }}">
+                               <h2>
+                                       {% if service != entry.service %}
+                                               <a href="{{ service.get_first_entry.get_absolute_url }}">
+                                       {% endif %}
+                                               {{ service.translation.title_userguide|upper }}
+                                       {% if service != entry.service %}
+                                               </a>
+                                       {% endif %}
+                               </h2>
+                                
+                                       {% if service == entry.service %}
+                               <ul>
+                                   {% for e in service.userguideentries.active %}
+                                       <li {% if e = entry %}class="current"{% endif %}>
+                                            <a href="{{ e.get_absolute_url }}"> {{ e.title }} </a> 
+                                         </li>
+                                   {% endfor %}
+                                       </ul>
+                               {% endif %}
+                         
+                       </div>
+                       {% endif %}
+               {% endfor %}
+       </div>
+</div> 
 
-{% fragment request "maincol" %}
-<div class="user-guide-entry">
-    <h2>{{ entry.title|upper }}</h2>
-    <div class="content">
-        {% for content in entry.content.main %}
-            {{ content.render }}
-        {% endfor %}
-    </div>
-    <div class="bottom-content backlink">
-        <a href="{{ entry.back_url }}">{% trans "&lt; Back to User guide" %}</a>
-    </div>
-</div>
-{% endfragment %}
+ 
+
+