Download as
Browse Code »

Commit b933c100667e29b73a2877d23bb75a7dad7488da

Authored by Lucas Kanashiro
2 parents 2a30ff9a 5e8d90a0
Exists in master and in 21 other branches 1.12.x, celery_service, change-passwd-signal, colab-vcard, colab_search, colab_tag, detach_super_archives, fix-dashboard, fix-message-preview, go_to_profile_panel, mobile_user_scalable, paginate-threads, profile_integration, removing_namespace, search_block, search_filters, split_screen, startplugin, timestamp_plugins, user_regex, validate-passwd

Merge pull request #62 from colab/fix_header 

Cleaned up HTML and extracted header
Showing 2 changed files with 7 additions and 87 deletions   Show diff stats
colab/templates/base.html
  Diff comments   View file @b933c10
... ... @@ -50,7 +50,7 @@
50 50 </head>
51 51  
52 52 <!-- data-no-turbolink will disable Rails TurboLinks for all pages under Colab -->
53   - <body class="container" data-no-turbolink>
  53 + <body data-no-turbolink>
54 54  
55 55 {% block ribbon %}
56 56 {% if ribbon %}
... ... @@ -62,84 +62,8 @@
62 62 {% endif %}
63 63 {% endblock %}
64 64  
65   - {% block navbar %}
66   - <nav class="navbar navbar-default navbar-fixed-top" role="navigation">
67   - <div class="container">
68   - <div class="navbar-header">
69   -
70   - <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-main">
71   - <span class="sr-only">Toggle navigation</span>
72   - <span class="icon-bar"></span>
73   - <span class="icon-bar"></span>
74   - <span class="icon-bar"></span>
75   - <span class="icon-bar"></span>
76   - </button>
77   - <a class="navbar-brand" href="/"><img alt="Colab" src="{% static 'img/logo.svg' %}"></a>
78   - </div>
79   - <div class="collapse navbar-collapse navbar-main">
80   - <ul class="nav navbar-nav">
81   -
82   - <li>
83   - <a href="{% url 'thread_list' %}">{% trans "Groups" %}</a>
84   - </li>
85   -
86   - {% plugins_menu %}
87   -
88   - <li class="hidden-lg hidden-md">
89   - <a href="{% url 'haystack_search' %}?q=">{% trans "Search" %}</a>
90   - </li>
91   - </ul>
92   -
93   - <ul class="nav navbar-nav navbar-right">
94   - {% if not user.is_authenticated %}
95   -
96   - <li class="dropdown hidden-xs hidden-lg">
97   - <a href="#" class="dropdown-toggle" data-toggle="dropdown">Acesso <b class="caret"></b></a>
98   - <ul class="dropdown-menu">
99   - {% trans 'Login' as login_text %}
100   - <li><a href="{% url 'signup' %}">{% trans "Register" %}</a></li>
101   - <li><a href="{% url 'login' %}">{% trans "Login" %}</a></li>
102   - </ul>
103   - </li>
104   - {% trans 'Login' as login_text %}
105   - <li class="visible-xs hidden-sm hidden-md"><a href="{% url 'signup' %}">{% trans "Register" %}</a></li>
106   - <li class="visible-xs hidden-sm hidden-md"><a href="{% url 'login' %}">{% trans "Login" %}</a></li>
107   - {% else %}
108   - <li id="user-menu" class="dropdown">
109   - <a href="#" class="dropdown-toggle user" data-toggle="dropdown">{% gravatar user.email 40 %} <b class="caret"></b>&nbsp;&nbsp;</a>
110   - <ul class="dropdown-menu" role="menu">
111   - <li>
112   - <div class="wrapper">
113   - <div class="thumbnail">{% gravatar user.email 100 %}</div>
114   - <div class="user-info">
115   - <span><b>{{ user.get_full_name }}</b></span>
116   - <span class="quiet">{{ user.email }}</span>
117   - </div>
118   - <div>
119   - <a class="btn btn-info pull-left" href="{% url 'user_profile' user.username %}">{% trans "My Profile" %}</a>
120   - {% trans 'Logout' as logout_text %}
121   - <a class="btn btn-default pull-right" href="{% url 'logout' %}"> {% trans "Logout" %}</a>
122   - </div>
123   - </div>
124   - </li>
125   - </ul>
126   - </li>
127   - {% endif %}
128   - </ul>
129   -
130   - <form action="{% url 'haystack_search' %}" method="GET" id="search-form" class="navbar-form navbar-right hidden-xs hidden-sm" role="search">
131   - <div class="form-group">
132   - <label class="sr-only" for="header-searchbox">{% trans 'Search here...' %}</label>
133   - <input name="q" id="header-searchbox"
134   - class="form-control" value="{{ request.GET.q }}"
135   - type="search" placeholder="{% trans 'Search here...' %}" />
136   - </div>
137   - <button type="submit" class="btn btn-default"><span class="glyphicon glyphicon-search"></span></button>
138   - </form>
139   - </div>
140   - </div>
141   - </nav>
142   -
  65 + {% block header %}
  66 + {% include 'header.html' %}
143 67 {% endblock %}
144 68  
145 69 {% block messages %}
... ... @@ -166,8 +90,6 @@
166 90 {% block main-content %}{% endblock %}
167 91 </div>
168 92  
169   - <div class="row">&nbsp;</div>
170   -
171 93 {% block footer %}
172 94  
173 95 {% include "footer.html" %}
... ...
colab/templates/header.html
  Diff comments   View file @b933c10
... ... @@ -23,8 +23,6 @@
23 23  
24 24 {% plugins_menu %}
25 25  
26   - <li><a href="/paste">{% trans "Paste" %}</a></li>
27   -
28 26 <li class="hidden-lg hidden-md">
29 27 <a href="{% url 'haystack_search' %}?q=">{% trans "Search" %}</a>
30 28 </li>
... ... @@ -42,8 +40,8 @@
42 40 </ul>
43 41 </li>
44 42 {% trans 'Login' as login_text %}
45   - <li class="visible-xs hidden-sm hidden-md"><a href="{% url 'signup' %}">{% trans "Register" %}</a></li>
46   - <li class="visible-xs hidden-sm hidden-md"><a href="{% url 'login' %}">{% trans "Login" %}</a></li>
  43 + <li class="visible-xs hidden-sm hidden-md"><a href="{% url 'signup' %}">{% trans "Register" %}</a></li>
  44 + <li class="visible-xs hidden-sm hidden-md"><a href="{% url 'login' %}">{% trans "Login" %}</a></li>
47 45 {% else %}
48 46 <li id="user-menu" class="dropdown">
49 47 <a href="#" class="dropdown-toggle user" data-toggle="dropdown">{% gravatar user.email 40 %} <b class="caret"></b>&nbsp;&nbsp;</a>
... ... @@ -71,8 +69,8 @@
71 69 <div class="form-group">
72 70 <label class="sr-only" for="header-searchbox">{% trans 'Search here...' %}</label>
73 71 <input name="q" id="header-searchbox"
74   - class="form-control" value="{{ request.GET.q }}"
75   - type="search" placeholder="{% trans 'Search here...' %}" />
  72 + class="form-control" value="{{ request.GET.q }}"
  73 + type="search" placeholder="{% trans 'Search here...' %}" />
76 74 </div>
77 75 <button type="submit" class="btn btn-default"><span class="glyphicon glyphicon-search"></span></button>
78 76 </form>
... ...