Changeset - 08c8f23344a3
Parent rev.
Child rev.
[Not reviewed]
Merge
0 13 1
Christopher Neugebauer - 8 years ago 2016-06-27 01:28:06
_@chrisjrn.com
Merge pull request #23 from faulteh/master

site_base.html refactor
14 files changed with 68 insertions and 18 deletions:
pinaxcon/templates/cms_pages/content_page.html
1
1
pinaxcon/templates/cms_pages/home_page.html
1
1
pinaxcon/templates/cms_pages/news_index_page.html
1
1
pinaxcon/templates/cms_pages/news_page.html
1
1
pinaxcon/templates/dashboard.html
6
1
pinaxcon/templates/site_base.html
18
8
pinaxcon/templates/site_base_onecolumn.html
6
2
pinaxcon/templates/site_base_wagtail.html
11
pinaxcon/templates/symposion/proposals/base.html
3
2
pinaxcon/templates/symposion/proposals/proposal_detail.html
1
pinaxcon/templates/symposion/reviews/base.html
8
pinaxcon/templates/symposion/reviews/result_notification.html
2
pinaxcon/templates/symposion/reviews/review_detail.html
1
pinaxcon/templates/symposion/reviews/review_review.html
8
1
0 comments (0 inline, 0 general)
pinaxcon/templates/cms_pages/content_page.html
➞
Show inline comments
 
{% extends "site_base.html" %}
 
{% extends "site_base_wagtail.html" %}
 
{% load staticfiles %}
 
{% load wagtailcore_tags %}
 

			




	
	
	
		
 
{% load sitetree %}


			




        

    


    
    

    

        

                

                    pinaxcon/templates/cms_pages/home_page.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
	
		
 
{% extends "site_base.html" %}


			




	
	
	
		
 
{% extends "site_base_wagtail.html" %}


			




	
	
	
		
 

			




	
	
	
		
 
{% load i18n %}


			




	
	
	
		
 

			




	
	
	
		
 
{% load wagtailcore_tags %}


			




        

    


    
    

    

        

                

                    pinaxcon/templates/cms_pages/news_index_page.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
	
		
 
{% extends "site_base.html" %}


			




	
	
	
		
 
{% extends "site_base_wagtail.html" %}


			




	
	
	
		
 

			




	
	
	
		
 
{% load staticfiles %}


			




	
	
	
		
 
{% load wagtailcore_tags %}


			




	
	
	
		
 
{% load wagtailimages_tags %}


			




        

    


    
    

    

        

                

                    pinaxcon/templates/cms_pages/news_page.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
	
		
 
{% extends "site_base.html" %}


			




	
	
	
		
 
{% extends "site_base_wagtail.html" %}


			




	
	
	
		
 

			




	
	
	
		
 
{% load wagtailcore_tags %}


			




	
	
	
		
 
{% load wagtailimages_tags %}


			




	
	
	
		
 

			




        

    


    
    

    

        

                

                    pinaxcon/templates/dashboard.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
	
		
 
{% extends "site_base.html" %}


			




	
	
	
		
 

			




	
	
	
		
 
{% load staticfiles %}


			




	
	
	
		
 
{% load i18n %}


			




	
	
	
		
 
{% load proposal_tags %}


			




	
	
	
		
 
{% load review_tags %}


			




	
	
	
		
 
{% load teams_tags %}


			




	
	
	
		
 
{# {% load registrasion_tags %} #}


			




	
	
	
		
 

			




	
	
	
		
 
{% block head_title %}Dashboard{% endblock %}


			




	
	
	
		
 

			




	
	
	
		
 
{% block extra_style %}


			




	
	
	
		
 
<link rel="stylesheet" href="{% static 'css/site-0a247b924d.css' %}">


			




	
	
	
		
 
<!-- Latest compiled and minified CSS -->


			




	
	
	
		
 
{% endblock %}


			




	
	
	
		
 

			




	
	
	
		
 
{% block body_class %}auth{% endblock %}


			




	
	
	
		
 

			




	
	
	
		
 
{% block body %}


			




	
	
	
		
 
    <div class="panel panel-default">


			




        

    


    
    

    

        

                

                    pinaxcon/templates/site_base.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	...
	
		
 
@@ -19,8 +19,11 @@


			




	
	
	
		
 
    <!--FIXME: download-->


			




	
	
	
		
 
    <link href="https://fonts.googleapis.com/css?family=Titillium+Web:700,900|Roboto:400italic,400,700,700italic" rel="stylesheet" type="text/css">


			




	
	
	
		
 
    <!--Meta tags-->


			




	
	
	
		
 
    <meta name="theme-color" content="#0c486c">


			




	
	
	
		
 
    {% block extra_style %}


			




	
	
	
		
 
    <link rel="stylesheet" href="{% static 'css/site-0a247b924d.css' %}">


			




	
	
	
		
 
    {% endblock %}


			




	
	
	
		
 
{% endblock %}


			




	
	
	
		
 
    <!--Twitter-->


			




	
	
	
		
 
    <meta name="twitter:card" content="summary">


			




	
	
	
		
 
    <meta name="twitter:site" content="@linuxconfau">


			




	...
	
		
 
@@ -54,25 +57,33 @@


			




	
	
	
		
 
    {% endblock %}


			




	
	
	
		
 
{% endblock %}


			




	
	
	
		
 

			




	
	
	
		
 
{% block body_base %}


			




	
	
	
		
 
    <div style="height: 100px;" />


			




	
	
	
		
 
    <main role="main">


			




	
	
	
		
 
<div class="l-content-page">


			




	
	
	
		
 
        <section id="content_body">


			




	
	
	
		
 
        <div class="container">


			




	
	
	
		
 
            {% include "_messages.html" %}


			




	
	
	
		
 
            <div class="row">


			




	
	
	
		
 
                <div class="col-md-9">


			




	
	
	
		
 
    {% block body %}


			




	
	
	
		
 
      {% block content %}


			




	
	
	
		
 
      {% endblock %}


			




	
	
	
		
 
    {% endblock %}


			




	
	
	
		
 
                </div>


			




	
	
	
		
 
                <div class="col-md-3">


			




	
	
	
		
 
                    {% block sidebar %}


			




	
	
	
		
 
                        {% include "_default_sidebar.html" %}


			




	
	
	
		
 
                    {% endblock %}


			




	
	
	
		
 

			




	
	
	
		
 
{% block footer_base %}


			




	
	
	
		
 
      <div class="panel panel__compact panel__bg">


			




	
	
	
		
 
        <div style="background-image: url('');" class="panel--bg"></div>


			




	
	
	
		
 
        <div class="panel--content">


			




	
	
	
		
 
          <div class="panel--2-3">


			




	
	
	
		
 
            <!-- TODO: put something here. -->


			




	
	
	
		
 
                </div>


			




	
	
	
		
 
            </div>


			




	
	
	
		
 
        </div>


			




	
	
	
		
 
    </section>


			




	
	
	
		
 
</div>


			




	
	
	
		
 
{% endblock %}


			




	
	
	
		
 

			




	
	
	
		
 
{% block footer_base %}


			




	
	
	
		
 
      <!-- https://gist.github.com/geedmo/5682742-->


			




	
	
	
		
 
      <footer class="l-footer">


			




	
	
	
		
 
        {% block footer %}


			




	
	
	
		
 
        <div class="l-footer--text">


			




	...
	
		
 
@@ -82,9 +93,8 @@


			




	
	
	
		
 
        </div>


			




	
	
	
		
 
        <div class="l-footer--logos">


			




	
	
	
		
 
          <img src="{% static 'lca2017/images/HPE.jpg' %}" role="presentation">


			




	
	
	
		
 
          <img src="{% static 'lca2017/images/IBM.jpg' %}" role="presentation"></div>


			




	
	
	
		
 
        <p class="lede">© 2016 linux.conf.au 2017 and Linux Australia. Linux is a registered trademark of Linus Torvalds. Site design by <a href="http://takeflight.com.au" >Takeflight</a>. <a href="/colophon">Colophon</a>.</p>


			




	
	
	
		
 
        {% endblock %}


			




	
	
	
		
 
      </footer>


			




	
	
	
		
 
{% endblock %}


			




	
	
	
		
 
    </main>


			




        

    


    
    

    

        

                

                    pinaxcon/templates/site_base_onecolumn.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
	
		
 
{% extends "site_base.html" %}


			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
{% block body_base %}


			




	
	
	
		
 
    <div style="height: 100px;" />


			




	
	
	
		
 
    <main role="main">


			




	
	
	
		
 
<div class="l-content-page">


			




	
	
	
		
 
        <section id="content_body">


			




	
	
	
		
 
        <div class="container">


			




	
	
	
		
 
    {% include "_messages.html" %}


			




	
	
	
		
 
    {% block body %}


			




	
	
	
		
 
      {% block content %}


			




	
	
	
		
 
      {% endblock %}


			




	
	
	
		
 
    {% endblock %}


			




	
	
	
		
 
</div>


			




	
	
	
		
 
</section>


			




	
	
	
		
 
</div>


			




	
	
	
		
 
{% endblock %}


			




        

    


    
    

    

        

                

                    pinaxcon/templates/site_base_wagtail.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
	
		
 
new file 100644

			




	
	
	
		
 
{% extends "site_base.html" %}


			




	
	
	
		
 
{% block extra_style %}{% endblock %}


			




	
	
	
		
 
{% block body_base %}


			




	
	
	
		
 
    <div style="height: 100px;" />


			




	
	
	
		
 
    <main role="main">


			




	
	
	
		
 
    {% include "_messages.html" %}


			




	
	
	
		
 
    {% block body %}


			




	
	
	
		
 
      {% block content %}


			




	
	
	
		
 
      {% endblock %}


			




	
	
	
		
 
    {% endblock %}


			




	
	
	
		
 
{% endblock %}


			




        

    


    
    

    

        

                

                    pinaxcon/templates/symposion/proposals/base.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
	
		
 
{% extends "site_base.html" %}


			




	
	
	
		
 
{% load staticfiles %}


			




	
	
	
		
 

			




	
	
	
		
 
{% block body_outer %}


			




	
	
	
		
 
    {% block body %}{% endblock %}


			




	
	
	
		
 
{% block extra_script %}


			




	
	
	
		
 
<script src="{% static 'js/site-92ae8d0d6c.js' %}" type="text/javascript"></script>


			




	
	
	
		
 
{% endblock %}


			




        

    


    
    

    

        

                

                    pinaxcon/templates/symposion/proposals/proposal_detail.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	...
	
		
 
@@ -99,8 +99,9 @@


			




	
	
	
		
 
</div>


			




	
	
	
		
 
{% endblock %}


			




	
	
	
		
 

			




	
	
	
		
 
{% block extra_script %}


			




	
	
	
		
 
{{ block.super }}


			




	
	
	
		
 
    <script src="{{ STATIC_URL }}symposion/js/jquery.history.js"></script>


			




	
	
	
		
 
    <script type="text/javascript">


			




	
	
	
		
 
        $(function() {


			




	
	
	
		
 
            var History = window.History;


			




        

    


    
    

    

        

                

                    pinaxcon/templates/symposion/reviews/base.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
	
		
 
{% extends "site_base.html" %}


			




	
	
	
		
 
{% load staticfiles %}


			




	
	
	
		
 

			




	
	
	
		
 
{% load i18n %}


			




	
	
	
		
 
{% load sitetree %}


			




	
	
	
		
 

			




	
	
	
		
 
{% block extra_style %}


			




	
	
	
		
 
{{ block.super }}


			




	
	
	
		
 
    <style type="text/css">


			




	
	
	
		
 
        div.dataTables_length label {


			




	
	
	
		
 
            float: left;


			




	
	
	
		
 
            text-align: left;


			




	...
	
		
 
@@ -50,8 +52,12 @@


			




	
	
	
		
 

			




	
	
	
		
 
{% block body_class %}reviews{% endblock %}


			




	
	
	
		
 

			




	
	
	
		
 
{% block body_outer %}


			




	
	
	
		
 
<div class="l-content-page">


			




	
	
	
		
 
<div class="l-content-page--richtext">


			




	
	
	
		
 
<div class="rich-text">


			




	
	
	
		
 

			




	
	
	
		
 
    <div class="row">


			




	
	
	
		
 
        <div class="col-md-2">


			




	
	
	
		
 
            {% block sidebar %}


			




	
	
	
		
 
            {% for section in review_sections %}


			




	...
	
		
 
@@ -87,11 +93,13 @@


			




	
	
	
		
 
            {% block body %}


			




	
	
	
		
 
            {% endblock %}


			




	
	
	
		
 
        </div>


			




	
	
	
		
 
    </div>


			




	
	
	
		
 
</div></div></div>


			




	
	
	
		
 
{% endblock %}


			




	
	
	
		
 

			




	
	
	
		
 
{% block extra_script %}


			




	
	
	
		
 
    <script src="{% static 'js/site-92ae8d0d6c.js' %}" type="text/javascript"></script>


			




	
	
	
		
 
    <script src="{{ STATIC_URL }}datatables/js/jquery.dataTables.min.js" type="text/javascript"></script>


			




	
	
	
		
 
    <script src="{{ STATIC_URL }}tabletools/js/TableTools.min.js" type="text/javascript"></script>


			




	
	
	
		
 
    <script src="{{ STATIC_URL }}datatables/js/dataTables.bootstrap.js" type="text/javascript"></script>


			




	
	
	
		
 
    <script type="text/javascript">


			




        

    


    
    

    

        

                

                    pinaxcon/templates/symposion/reviews/result_notification.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	...
	
		
 
@@ -5,8 +5,9 @@


			




	
	
	
		
 

			




	
	
	
		
 
{% block body_class %}{{ block.super }} review-results{% endblock %}


			




	
	
	
		
 

			




	
	
	
		
 
{% block extra_style %}


			




	
	
	
		
 
{{ block.super }}


			




	
	
	
		
 
    <style type="text/css">


			




	
	
	
		
 
        .table-striped tbody tr.selected td {


			




	
	
	
		
 
            background-color: #F7F4E6;


			




	
	
	
		
 
        }


			




	...
	
		
 
@@ -83,8 +84,9 @@


			




	
	
	
		
 
    </form>


			




	
	
	
		
 
{% endblock %}


			




	
	
	
		
 

			




	
	
	
		
 
{% block extra_script %}


			




	
	
	
		
 
{{ block.super }}


			




	
	
	
		
 
    <script type="text/javascript">


			




	
	
	
		
 
        (function($) {


			




	
	
	
		
 
            $.fn.actions = function(opts) {


			




	
	
	
		
 
                var options = $.extend({}, $.fn.actions.defaults, opts);


			




        

    


    
    

    

        

                

                    pinaxcon/templates/symposion/reviews/review_detail.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	...
	
		
 
@@ -167,8 +167,9 @@


			




	
	
	
		
 
    </div>


			




	
	
	
		
 
{% endblock %}


			




	
	
	
		
 

			




	
	
	
		
 
{% block extra_script %}


			




	
	
	
		
 
{{ block.super }}


			




	
	
	
		
 
    <script src="{{ STATIC_URL }}symposion/js/jquery.history.js"></script>


			




	
	
	
		
 
    <script type="text/javascript">


			




	
	
	
		
 
        $(function() {


			




	
	
	
		
 
            var History = window.History;


			




        

    


    
    

    

        

                

                    pinaxcon/templates/symposion/reviews/review_review.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
	
		
 
{% extends "site_base.html" %}


			




	
	
	
		
 
{% load staticfiles %}


			




	
	
	
		
 
{% block extra_style %}


			




	
	
	
		
 
<link rel="stylesheet" href="{% static 'css/site-0a247b924d.css' %}">


			




	
	
	
		
 
{% endblock %}


			




	
	
	
		
 

			




	
	
	
		
 
{% load bootstrap %}


			




	
	
	
		
 

			




	
	
	
		
 
{% block body_class %}review{% endblock %}


			




	
	
	
		
 

			




	
	
	
		
 
{% block body %}


			




	
	
	
		
 
<div class="l-content-page">


			




	
	
	
		
 
<div class="l-content-page--richtext">


			




	
	
	
		
 
<div class="rich-text">


			




	
	
	
		
 
    <h1>Proposal Review</h1>


			




	
	
	
		
 

			




	
	
	
		
 
    <div class="proposal">


			




	
	
	
		
 
        <h2>{{ proposal.title }}</h2>


			




	...
	
		
 
@@ -72,6 +79,6 @@


			




	
	
	
		
 
                <input type="submit" value="Submit" />


			




	
	
	
		
 
            </div>


			




	
	
	
		
 
        </fieldset>


			




	
	
	
		
 
    </form>


			




	
	
	
		
 

			




	
	
	
		
 
</div></div></div>


			




	
	
	
		
 
{% endblock %}


			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







    


    

  


    








    
        Server instance: kapok.sfconservancy.org-21136
    
    
        This site is powered by
            Kallithea 0.6.3,
        which is
        © 2010–2020 by various authors & licensed under GPLv3.
            – Support
        – Privacy Policy