Permalink
Browse files

Mop up.

  • Loading branch information...
1 parent e2d2abc commit 358f57a425d9efdd5aa739c6825a8c809f5135b8 @chrisrossi chrisrossi committed Apr 12, 2012
Showing with 1 addition and 28 deletions.
  1. +0 −7 karl/ux2/configure.zcml
  2. +0 −5 karl/ux2/layout.py
  3. +1 −2 karl/ux2/panels.py
  4. +0 −7 karl/ux2/templates/global_logo.pt
  5. +0 −7 karl/ux2/templates/global_nav.pt
View
@@ -291,13 +291,6 @@
renderer="templates/searchresults_file.pt"
/>
- <!-- Assets -->
- <!-- <asset
- to_override="bottlecap.layouts.popper:static/img/favicon.ico"
- override_with="karl.views:static/ux2/favicon.ico"
- /> -->
-
-
<!-- Pushdowns data, and global notifications -->
<view
View
@@ -1,16 +1,11 @@
-import copy
import json
-#from bottlecap.layouts.popper.layout import PopperLayout
-#from bottlecap.layouts.popper.layout import get_microtemplates
-from bottlecap.layout import layout_config
from pyramid.decorator import reify
from pyramid.renderers import get_renderer
from pyramid.security import effective_principals
from pyramid.security import has_permission
from pyramid.security import authenticated_userid
-from pyramid.settings import asbool
from pyramid.traversal import find_resource
from pyramid.url import resource_url
View
@@ -137,8 +137,7 @@ def personal_tools(context, request):
if photo is not None:
icon_url = thumb_url(photo, request, PROFILE_ICON_SIZE)
else:
- icon_url = request.static_url(
- 'bottlecap.layouts.popper:static/img/person.png')
+ icon_url = request.static_url('karl.views:static/img/person.png')
profile_url = request.resource_url(profile)
logout_url = "%s/logout.html" % request.application_url
return {'profile_name': profile.title,
@@ -1,11 +1,4 @@
<h1 id="bcpanel-global-logo" class="sitetitle">
- <tal:comment condition="layout.devmode">
- <!--
- This is the global-logo panel per
- https://agendaless.mybalsamiq.com/projects/popper/Popper+Overview
- Filename is bottlecap/layouts/popper/templates/global_logo.pt
- -->
- </tal:comment>
<a id="global-logo" href="${logo_href}"
title="${logo_title} home page">
${logo_title}
@@ -1,11 +1,4 @@
<nav id="bcpanel-global-nav">
- <tal:comment condition="layout.devmode">
- <!--
- This is the global-nav panel per
- https://agendaless.mybalsamiq.com/projects/popper/Popper+Overview
- Filename is bottlecap/layouts/popper/templates/global_nav.pt
- -->
- </tal:comment>
<div data-quickpanel="pushdown" class="topNavIconWrapper">
<h2 id="navigation-toggle" class="pushdown-toggle ir" data-toggle="pushdown">Navigation</h2>
<ul id="global-nav" class="pushdown pushDownList pushDownNavigation">

0 comments on commit 358f57a

Please sign in to comment.