Updates for NodeBB v1.5.0

pichalite · May 26, 2017 · f76121d · f76121d
1 parent d13148a
commit f76121d
Show file tree

Hide file tree

Showing 9 changed files with 92 additions and 28 deletions.
diff --git a/less/account.less b/less/account.less
@@ -19,7 +19,7 @@
 
 		&.card-padding {
 			padding: 15px 25px;
-			
+
 			@media (max-width: @screen-xs-max)
 			{
 				padding: 15px;
@@ -37,7 +37,7 @@
 		font-size: 16px;
 		font-weight: 500;
 	}
-	
+
 	.form-control {
 		color: inherit;
 		border-bottom: @input-border-bottom;
@@ -160,7 +160,7 @@
 			@media (max-width: @screen-xs-max) {
 			    margin-top: 40px;
 			}
-			
+
 			@media (min-width: @screen-md-min) {
 				position: absolute;
 			    top: -50px;
@@ -195,11 +195,11 @@
 				margin-bottom: 10px;
 			}
 		}
-		
+
 		[component="account/chat"], [component="account/follow"], [component="account/unfollow"] {
 			float: left;
 			margin: 15px 5px 0;
-			
+
 			@media (max-width: @screen-xs-max) {
 				float: inherit;
 				margin: 0 5px 15px 5px;
@@ -302,7 +302,7 @@
 
 	@media (max-width: @screen-xs-max) {
 		right: 30px;
-	}	
+	}
 }
 
 .account-picture-block .user-profile-picture {
@@ -313,8 +313,8 @@
 	line-height: 128px;
 }
 
-.account.change-username #change-username, 
-.account.change-password #change-password, 
+.account.change-username #change-username,
+.account.change-password #change-password,
 .account.change-email #change-email {
 	padding: 10px;
 }
@@ -334,26 +334,42 @@
 	&.account-info {
 		.ban-history {
 			padding-left: 0;
-			
+
 			.timestamp {
 				font-weight: bold;
 			}
-			
+
 			.expiry {
 				font-size: 11px;
 			}
 		}
-		
+
 		.recent-flags {
 			padding-left: 0;
-			
+
 			.title {
 				font-weight: bold;
 			}
-			
+
 			.timestamp {
 				font-size: 11px;
 			}
 		}
+
+		.moderation-history {
+			.timeline .frame .timeline-badge {
+				background: none;
+				border: none;
+				left: 5px;
+			}
+
+			.user-avatar {
+	            .user-avatar(30px);
+	        }
+
+	        .user-icon {
+	            .user-icon(30px, 1.6rem);
+	        }
+		}
 	}
-}
+}
diff --git a/less/skins.less b/less/skins.less
@@ -38,7 +38,7 @@ body {
             background-color: @btn-default-bg-color-dark;
         }
 
-        a.btn-primary, a.btn-danger {
+        a.btn-primary, a.btn-danger, a.btn-success {
             color: #fff;
         }
 

diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "nodebb-theme-material",
   "version": "2.10.3",
   "nbbpm": {
-    "compatibility": "^1.4.4"
+    "compatibility": "^1.5.0"
   },
   "description": "Material Design theme for NodeBB",
   "main": "theme.less",

diff --git a/templates/account/info.tpl b/templates/account/info.tpl
@@ -141,12 +141,41 @@
 					[[user:info.moderation-note]]
 				</div>
 				<div class="card-body card-padding">
-					<textarea component="account/moderation-note" class="form-control">{moderationNote}</textarea>
-					<br/>
-					<button class="btn btn-sm btn-success" component="account/save-moderation-note">[[global:save]]</button>
+					<div class="form-group">
+						<div class="fg-line">
+							<textarea component="account/moderation-note" class="form-control" rows="5"></textarea>
+						</div>
+					</div>
+
+					<button class="btn btn-sm btn-success" component="account/save-moderation-note">[[user:info.moderation-note.add]]</button>
+					<hr>
+					<div class="moderation-history" component="account/moderation-note/list">
+						<!-- BEGIN moderationNotes -->
+						<div class="timeline single">
+							<div class="frame">
+								<div class="timeline-badge">
+									<a href="<!-- IF moderationNotes.user.userslug -->{config.relative_path}/user/{moderationNotes.user.userslug}<!-- ELSE -->#<!-- ENDIF moderationNotes.user.userslug -->">
+	 									<!-- IF moderationNotes.user.picture -->
+	 									<img class="user-avatar" component="user/picture" data-uid="{moderationNotes.user.uid}" src="{moderationNotes.user.picture}" align="left" itemprop="image" />
+	 									<!-- ELSE -->
+	 									<div component="user/picture" data-uid="{moderationNotes.user.uid}" class="user-icon" style="background-color: {moderationNotes.user.icon:bgColor};">{moderationNotes.user.icon:text}</div>
+	 									<!-- ENDIF moderationNotes.user.picture -->
+	 								</a>
+								</div>
+								<span class="timeline-date">
+									<a href="<!-- IF moderationNotes.user.userslug -->{config.relative_path}/user/{moderationNotes.user.userslug}<!-- ELSE -->#<!-- ENDIF moderationNotes.user.userslug -->" itemprop="author" data-username="{moderationNotes.user.username}" data-uid="{moderationNotes.user.uid}">{moderationNotes.user.username}</a> <span class="timeago" title="{moderationNotes.timestampISO}"></span>
+								</span>
+								<div class="timeline-content">
+									{moderationNotes.note}
+								</div>
+							</div>
+						</div>
+						<!-- END moderationNotes -->
+					</div>
+					<!-- IMPORT partials/paginator.tpl -->
 				</div>
 			</div>
 			<!-- ENDIF isAdminOrGlobalModerator -->
 		</div>
 	</div>
-</div>
+</div>
diff --git a/templates/groups/details.tpl b/templates/groups/details.tpl
@@ -203,7 +203,7 @@
 					<div class="form-group">
 						<div class="fg-line">
 							<label for="name">[[groups:details.group_name]]</label>
-							<input class="form-control" name="name" id="name" type="text" value="{group.displayName}" />
+							<input class="form-control" name="name" id="name" type="text" value="{group.displayName}" <!-- IF group.system -->readonly<!-- ENDIF group.system --> />
 						</div>
 					</div>
 					<div class="form-group">

diff --git a/templates/header.tpl b/templates/header.tpl
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="{function.localeToHTML, defaultLang}">
+<html lang="{function.localeToHTML, userLang, defaultLang}">
 <head>
 	<title>{browserTitle}</title>
 	<!-- BEGIN metaTags -->

diff --git a/templates/notifications.tpl b/templates/notifications.tpl
@@ -7,6 +7,27 @@
 
 	<div class="card">
 		<div class="listview lv-bordered lv-lg">
+			<div class="lv-header-alt">
+				<div class="title pull-right">
+					<div class="btn-group">
+						<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
+							<!-- IF selectedFilter -->{selectedFilter.name}<!-- ENDIF selectedFilter --> <span class="caret"></span>
+						</button>
+						<ul class="dropdown-menu">
+							<!-- BEGIN filters -->
+							<!-- IF filters.separator -->
+							<li role="separator" class="divider"></li>
+							<!-- ELSE -->
+							<li>
+								<a href="{config.relative_path}/notifications?filter={filters.filter}"><i class="fa fa-fw <!-- IF filters.selected -->fa-check<!-- ENDIF filters.selected -->"></i>{filters.name}</a>
+							</li>
+							<!-- ENDIF filters.separator -->
+							<!-- END filters -->
+						</ul>
+					</div>
+					<button type="button" class="btn btn-default" component="notifications/mark_all">[[notifications:mark_all_read]]</button>
+				</div>
+		    </div>
 			<div class="lv-body notifications-list" data-nextstart="{nextStart}">
 				<!-- BEGIN notifications -->
 				<div class="lv-item media {notifications.readClass}" data-nid="{notifications.nid}" component="notifications/item">
@@ -31,5 +52,3 @@
 		</div>
 	</div>
 </div>
-
-
diff --git a/templates/partials/chats/dropdown.tpl b/templates/partials/chats/dropdown.tpl
@@ -9,7 +9,7 @@
 		<div class="user-icon" style="background-color: {rooms.lastUser.icon:bgColor}">{rooms.lastUser.icon:text}</div>
 		<!-- ENDIF rooms.lastUser.picture -->
 		<!-- ENDIF lastUser -->
-		
+
 		<!-- IF lastUser -->
 		{rooms.usernames}
 		<!-- ELSE -->
@@ -19,5 +19,5 @@
 </li>
 <!-- END rooms -->
 <!-- ELSE -->
-<li class="no_active"><a href="#">No active chats</a></li>
+<li class="no_active"><a href="#">[[modules:chat.no_active]]</a></li>
 <!-- ENDIF rooms.length -->
diff --git a/templates/partials/chats/message.tpl b/templates/partials/chats/message.tpl
@@ -1,4 +1,4 @@
-<li component="chat/message" class="lv-item media<!-- IF messages.self --> right<!-- ENDIF messages.self -->" data-index="{messages.index}" data-mid="{messages.messageId}" data-uid="{messages.fromuid}" data-self="{messages.self}" data-break="{messages.newSet}">
+<li component="chat/message" class="lv-item media<!-- IF messages.self --> right<!-- ENDIF messages.self -->" data-index="{messages.index}" data-mid="{messages.messageId}" data-uid="{messages.fromuid}" data-self="{messages.self}" data-break="{messages.newSet}" data-timestamp="{messages.timestamp}">
     <div class="lv-avatar <!-- IF messages.self -->pull-right<!-- ELSE -->pull-left<!-- ENDIF messages.self -->">
         <!-- IF messages.fromUser.picture -->
         <img class="user-avatar" src="{messages.fromUser.picture}">
@@ -14,7 +14,7 @@
             <!-- IF messages.edited -->
             <small class="text-muted chat-edit" title="[[global:edited]] {messages.editedISO}"><i class="fa fa-edit"></i></span></small>
             <!-- ENDIF messages.edited -->
-            
+
             <!-- IF !config.disableChatMessageEditing -->
             <!-- IF messages.self -->
             <div class="chat-controls">