merging conflicts

Author: bcambel

pyhackers/controllers/main.py

@@ -188,6 +188,11 @@ def fancy_os_list():
     return render_template('project_frame.html', projects=[])
 
 
+@main_app.route('/top-python-contributors-developers')
+def top_python_dudes():
+    return render_template("top-python-developers.html")
+
+
 @main_app.route('/os')
 @main_app.route('/os/')
 @main_app.route('/open-source/')
@@ -226,8 +231,9 @@ def package_details(package):
     return render_base_template("package.html", package=package_obj, description=description)
 
 
-@cache.cached(timeout=10000, unless=request_force_non_cache)
+
 @main_app.route('/python-packages/')
+@cache.cached(timeout=10000, unless=request_force_non_cache)
 def package_list():
     packages = Package.query.order_by(Package.mdown.desc()).limit(1000)
 
@@ -296,8 +302,9 @@ def channel(name):
     return render_base_template("channel.html", channel_name=channel_name)
 
 
-@cache.memoize(timeout=10000, unless=request_force_non_cache)
+
 @main_app.route('/user/<regex(".+"):nick>')
+@cache.memoize(timeout=10000, unless=request_force_non_cache)
 def user_profile(nick):
     _ = get_profile_by_nick(nick)
     if _ is not None:
@@ -317,6 +324,7 @@ def find_tutorial(slug):
 
 
 @main_app.route('/tutorial/<regex(".+"):nick>/<regex(".+"):slug>')
+@cache.memoize(timeout=10000, unless=request_force_non_cache)
 def tutorial(nick, slug):
     return render_template("tutorial.html", tutorial=find_tutorial("{}/{}".format(nick, slug)))
 

pyhackers/static/css/app.css

@@ -33,7 +33,7 @@ div#page-wrap {
     padding-bottom: 85px; /* height of footer */
 }
 
-#body #main .container{
+#body #main .container, #body #main .container-fluid{
     background-color:white;
     border-radius: 5px;
     /*padding-left:50px;*/
@@ -322,4 +322,4 @@ body{
 }
 .discussions .topic p{
     padding-left:5px;
-}
+}

pyhackers/static/minified.html

@@ -44,9 +44,32 @@
 
                 <li><a href="/links">Links</a></li>
                 <li><a href="/top-python-projects/" style="color:orangered;font-weight:bold;">Top Python Projects</a></li>
+<<<<<<< HEAD
                 <li><a href="/discuss/home" style="">Discussion</a></li>
 
 
+=======
+                <li><a href="/top-python-contributors-developers" style="color:aqua;font-weight:bold;">Top Python Contributors</a></li>
+                {#                <li class="dropdown">#}
+                {#                    <a class="dropdown-toggle" data-toggle="dropdown" href="#">#}
+                {#                        Channels<b class="caret"></b>#}
+                {#                    </a>#}
+                {#                    <ul class="dropdown-menu">#}
+                {#                        {% for channel in channels %}#}
+                {#                            <li><a href="/channels/{{ channel.slug }}">{{ channel.name }}</a></li>#}
+                {#                        {% endfor %}#}
+                {##}
+                {#                        <li class="divider"></li>#}
+                {#                        <li><a href="/channels/lobby">Lobby</a></li>#}
+                {#                    </ul>#}
+
+                {#                <li><a href="#mc_embed_signup" id='join-us' data-toggle='modal' data-track='newsletter'>Join Beta&nbsp;(200+)</a></li>#}
+                <li><a href='/about'>About</a></li>
+{#                <li><a href="http://github.com/pythonhackers/pythonhackers" target="_blank"><i class='fa fa-github'></i>&nbsp;28</a>#}
+{#                </li>#}
+{#                <li><a href="http://twitter.com/pythonhackers" target="_blank"><i class='fa fa-twitter'></i>&nbsp;260#}
+{#                </a></li>#}
+>>>>>>> d76ff557694b26297d75d1115c9f45b43b0e813c
             </ul>
             <ul class='nav navbar-nav pull-right'>
                 {% if logged_in %}
@@ -107,18 +130,22 @@
 
 
 
+
     <script src="{{ static_route }}/js/underscore-min.js" type="text/javascript"></script>
     <script src="{{ static_route }}/js/bootstrap.min.js" type="text/javascript"></script>
     <script src="//cdnjs.cloudflare.com/ajax/libs/handlebars.js/1.3.0/handlebars.min.js" type="text/javascript"></script>
     <script src="/static/js/app/main.js?_={{ cache_buster }}"></script>
-{% block script_links %}{% endblock %}
+    {% block script_links %}{% endblock %}
 
     {% if PROD %}
         {% include "3rd_party.html" %}
     {% endif %}
+
     <script>
         {% block scripts %}{% endblock %}
+        {% autoescape off %}var session = {{ user_json }};{% endautoescape %}
+
     </script>
 </div>
 </body>
-</html>
+</html>