hyperzlib
/
nodebb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/designcreateplay/NodeBB

Browse Source
v1.18.x
Baris Usakli 12 years ago
parent caaede7e84 3ed9e1dd51
commit e9054301d1
7 changed files with 39 additions and 20 deletions
Show Stats Download Patch File Download Diff File

21
public/css/noscript.less
Unescape Escape View File

@ -14,6 +14,10 @@ noscript {
.icon { .icon {
float: left; float: left;
width: auto;
height: auto;
padding: 0;
margin: 0;
margin-right: 1em; margin-right: 1em;
} }
@ -34,7 +38,8 @@ noscript {
img { img {
float: left; float: left;
width: 32px; width: 64px;
margin-right: 1em;
} }
p { p {
@ -52,6 +57,20 @@ noscript {
.posts { .posts {
li { li {
.default; .default;
img {
width: 64px;
}
.profile {
text-align: center;
span {
font-weight: bold;
display: inline-block;
margin-top: 1em;
}
}
} }
} }
} }

8
public/src/modules/taskbar.js
Unescape Escape View File

@ -5,11 +5,11 @@ define(function() {
tasklist: undefined, tasklist: undefined,
init: function() { init: function() {
var footerEl = document.getElementById('footer'); var footerEl = document.getElementById('footer');
taskbar.taskbar = document.createElement('div'); taskbar.taskbar = document.createElement('div');
var jTaskbar = $(taskbar.taskbar); var jTaskbar = $(taskbar.taskbar);
taskbar.taskbar.innerHTML = '<div class="navbar-inner"><ul class="nav pull-right"></ul></div>'; taskbar.taskbar.innerHTML = '<div class="navbar-inner"><ul class="nav navbar-nav pull-right"></ul></div>';
taskbar.taskbar.className = 'taskbar navbar navbar-fixed-bottom'; taskbar.taskbar.className = 'taskbar navbar navbar-default navbar-fixed-bottom';
taskbar.taskbar.id = 'taskbar'; taskbar.taskbar.id = 'taskbar';
taskbar.tasklist = taskbar.taskbar.querySelector('ul'); taskbar.tasklist = taskbar.taskbar.querySelector('ul');
@ -60,7 +60,7 @@ define(function() {
var element = $(taskbar.tasklist).find('li[data-uuid="'+uuid+'"]'); var element = $(taskbar.tasklist).find('li[data-uuid="'+uuid+'"]');
if(element.length) if(element.length)
return; return;
var btnEl = document.createElement('li'); var btnEl = document.createElement('li');
btnEl.innerHTML = '<a href="#">' + btnEl.innerHTML = '<a href="#">' +

4
public/templates/header.tpl
Unescape Escape View File

@ -31,7 +31,7 @@
</head> </head>
<body> <body>
<div class="navbar navbar-inverse navbar-fixed-top" id="header-menu"> <div class="navbar navbar-inverse navbar-fixed-top" role="navigation" id="header-menu">
<div class="container"> <div class="container">
<div class="navbar-header"> <div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse"> <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
@ -42,7 +42,7 @@
<a class="navbar-brand" href="/">{title}</a> <a class="navbar-brand" href="/">{title}</a>
</div> </div>
<div class="navbar-collapse collapse"> <div class="navbar-collapse collapse navbar-ex1-collapse">
<ul id="main-nav" class="nav navbar-nav"> <ul id="main-nav" class="nav navbar-nav">
<li> <li>
<a href="/recent">Recent</a> <a href="/recent">Recent</a>

3
public/templates/noscript/category.tpl
Unescape Escape View File

@ -8,10 +8,11 @@
<li> <li>
<a href="../../topic/{topics.slug}">{topics.title} ({topics.postcount})</a> <a href="../../topic/{topics.slug}">{topics.title} ({topics.postcount})</a>
<div class="teaser"> <div class="teaser">
<img class="img-thumbnail" src="../../graph/users/{topics.teaser_username}/picture" /> <img class="img-thumbnail" src="{topics.teaser_userpicture}" />
<p> <p>
{topics.teaser_text} &mdash; {topics.teaser_timestamp} ago {topics.teaser_text} &mdash; {topics.teaser_timestamp} ago
</p> </p>
<div class="clear"></div>
</div> </div>
</li> </li>
<!-- END topics --> <!-- END topics -->

4
public/templates/noscript/header.tpl
Unescape Escape View File

@ -1,6 +1,6 @@
<div class="alert alert-error"> <div class="alert alert-danger">
<p> <p>
Your browser does not seem to support javascript. As a result, your viewing experience will be diminished. Your browser does not seem to support javascript. As a result, your viewing experience will be diminished, and you have been placed in <strong>read-only mode</strong>.
</p> </p>
<p> <p>
Please download a browser that supports javascript, or enable it, if it disabled (i.e. NoScript). Please download a browser that supports javascript, or enable it, if it disabled (i.e. NoScript).

16
public/templates/noscript/topic.tpl
Unescape Escape View File

@ -2,11 +2,11 @@
<!-- BEGIN main_posts --> <!-- BEGIN main_posts -->
<li> <li>
<div class="row"> <div class="row">
<div class="span2"> <div class="col-lg-2 profile">
<img src="{main_posts.picture}" /><br /> <img class="img-thumbnail" src="{main_posts.picture}" /><br />
{main_posts.username} <span class="username">{main_posts.username}</span>
</div> </div>
<div class="span10"> <div class="col-lg-10">
{main_posts.content} {main_posts.content}
</div> </div>
</div> </div>
@ -15,11 +15,11 @@
<!-- BEGIN posts --> <!-- BEGIN posts -->
<li> <li>
<div class="row"> <div class="row">
<div class="span2"> <div class="col-lg-2 profile">
<img src="{posts.picture}" /><br /> <img class="img-thumbnail" src="{posts.picture}" /><br />
{posts.username} <span class="username">{posts.username}</span>
</div> </div>
<div class="span10"> <div class="col-lg-10">
{posts.content} {posts.content}
</div> </div>
<div class="clear"></div> <div class="clear"></div>

3
src/webserver.js
Unescape Escape View File

@ -235,8 +235,7 @@ var express = require('express'),
}); });
}, },
function(topicData, next) { function(topicData, next) {
var posts = topicData.posts.push(topicData.main_posts[0]), var lastMod = 0,
lastMod = 0,
timestamp; timestamp;
for(var x=0,numPosts=topicData.posts.length;x<numPosts;x++) { for(var x=0,numPosts=topicData.posts.length;x<numPosts;x++) {

Write Preview
Loading…
Cancel
Save