Begin admin design

client/src/app/+admin/admin.component.html

@@ -0,0 +1,27 @@
+<div class="row">
+  <div class="sub-menu">
+    <a *ngIf="hasUsersRight()" routerLink="/admin/users" routerLinkActive="active" class="title-page">
+      Users
+    </a>
+
+    <a *ngIf="hasServerFollowRight()" routerLink="/admin/follows" routerLinkActive="active" class="title-page">
+      Manage follows
+    </a>
+
+    <a *ngIf="hasVideoAbusesRight()" routerLink="/admin/video-abuses" routerLinkActive="active" class="title-page">
+      Video abuses
+    </a>
+
+    <a *ngIf="hasVideoBlacklistRight()" routerLink="/admin/video-blacklist" routerLinkActive="active" class="title-page">
+      Video blacklist
+    </a>
+
+    <a *ngIf="hasJobsRight()" routerLink="/admin/jobs" routerLinkActive="active" class="title-page">
+      Jobs
+    </a>
+  </div>
+
+  <div class="margin-content">
+    <router-outlet></router-outlet>
+  </div>
+</div>

client/src/app/+admin/admin.component.ts

@@ -1,7 +1,31 @@
 import { Component } from '@angular/core'
+import { UserRight } from '../../../../shared'
+import { AuthService } from '../core/auth/auth.service'
 
 @Component({
-  template: '<router-outlet></router-outlet>'
+  templateUrl: './admin.component.html',
+  styleUrls: [ './admin.component.scss' ]
 })
 export class AdminComponent {
+  constructor (private auth: AuthService) {}
+
+  hasUsersRight () {
+    return this.auth.getUser().hasRight(UserRight.MANAGE_USERS)
+  }
+
+  hasServerFollowRight () {
+    return this.auth.getUser().hasRight(UserRight.MANAGE_SERVER_FOLLOW)
+  }
+
+  hasVideoAbusesRight () {
+    return this.auth.getUser().hasRight(UserRight.MANAGE_VIDEO_ABUSES)
+  }
+
+  hasVideoBlacklistRight () {
+    return this.auth.getUser().hasRight(UserRight.MANAGE_VIDEO_BLACKLIST)
+  }
+
+  hasJobsRight () {
+    return this.auth.getUser().hasRight(UserRight.MANAGE_JOBS)
+  }
 }

client/src/app/+admin/follows/followers-list/followers-list.component.html

@@ -1,5 +1,3 @@
-<div class="row">
-  <div class="content-padding">
 <h3>Followers list</h3>
 
 <p-dataTable
@@ -12,5 +10,3 @@
   <p-column field="state" header="State"></p-column>
   <p-column field="createdAt" header="Created date" [sortable]="true"></p-column>
 </p-dataTable>
-  </div>
-</div>

client/src/app/+admin/follows/following-add/following-add.component.html

@@ -1,6 +1,3 @@
-<div class="row">
-  <div class="content-padding">
-
 <h3>Add following</h3>
 
 <div *ngIf="error" class="alert alert-danger">{{ error }}</div>
@@ -31,5 +28,3 @@
 
   <input type="submit" value="Add following" class="btn btn-default" [disabled]="!isFormValid()">
 </form>
-  </div>
-</div>

client/src/app/+admin/follows/following-list/following-list.component.html

@@ -1,5 +1,3 @@
-<div class="row">
-  <div class="content-padding">
 <h3>Following list</h3>
 
 <p-dataTable
@@ -16,5 +14,3 @@
     </ng-template>
   </p-column>
 </p-dataTable>
-  </div>
-</div>

client/src/app/+admin/follows/follows.component.scss

@@ -1,21 +1,3 @@
 .follows-menu {
   margin-top: 20px;
 }
-
-tabset /deep/ {
-  .nav-link {
-    padding: 0;
-  }
-
-  .tab-link {
-    display: block;
-    text-align: center;
-    height: 40px;
-    width: 120px;
-    line-height: 40px;
-
-    &:hover, &:active, &:focus {
-      text-decoration: none !important;
-    }
-  }
-}

client/src/app/+admin/users/user-edit/user-edit.component.html

@@ -1,8 +1,5 @@
-<div class="row">
+<div class="admin-sub-title" *ngIf="isCreation() === true">Add user</div>
-  <div class="content-padding">
+<div class="admin-sub-title" *ngIf="isCreation() === false">Edit user {{ username }}</div>
-
-    <h3 *ngIf="isCreation() === true">Add user</h3>
-    <h3 *ngIf="isCreation() === false">Edit user {{ username }}</h3>
 
 <div *ngIf="error" class="alert alert-danger">{{ error }}</div>
 
@@ -11,9 +8,9 @@
     <label for="username">Username</label>
     <input
       type="text" class="form-control" id="username" placeholder="john"
-          formControlName="username"
+      formControlName="username" [ngClass]="{ 'input-error': formErrors['username'] }"
     >
-        <div *ngIf="formErrors.username" class="alert alert-danger">
+    <div *ngIf="formErrors.username" class="form-error">
       {{ formErrors.username }}
     </div>
   </div>
@@ -22,9 +19,9 @@
     <label for="email">Email</label>
     <input
       type="text" class="form-control" id="email" placeholder="mail@example.com"
-          formControlName="email"
+      formControlName="email" [ngClass]="{ 'input-error': formErrors['email'] }"
     >
-        <div *ngIf="formErrors.email" class="alert alert-danger">
+    <div *ngIf="formErrors.email" class="form-error">
       {{ formErrors.email }}
     </div>
   </div>
@@ -33,9 +30,9 @@
     <label for="password">Password</label>
     <input
       type="password" class="form-control" id="password"
-          formControlName="password"
+      formControlName="password" [ngClass]="{ 'input-error': formErrors['password'] }"
     >
-        <div *ngIf="formErrors.password" class="alert alert-danger">
+    <div *ngIf="formErrors.password" class="form-error">
       {{ formErrors.password }}
     </div>
   </div>
@@ -48,7 +45,7 @@
       </option>
     </select>
 
-        <div *ngIf="formErrors.role" class="alert alert-danger">
+    <div *ngIf="formErrors.role" class="form-error">
       {{ formErrors.role }}
     </div>
   </div>
@@ -69,5 +66,3 @@
 
   <input type="submit" value="{{ getFormButtonTitle() }}" class="btn btn-default" [disabled]="!form.valid">
 </form>
-  </div>
-</div>

client/src/app/+admin/users/user-edit/user-edit.component.scss

@@ -1,3 +1,21 @@
+.admin-sub-title {
+  margin-bottom: 30px;
+}
+
+input:not([type=submit]) {
+  @include peertube-input-text(340px);
+  display: block;
+}
+
+select {
+  @include peertube-select(340px);
+}
+
+input[type=submit] {
+  @include peertube-button;
+  @include orange-button;
+}
+
 .transcoding-information {
   margin-top: 5px;
   font-size: 11px;

client/src/app/+admin/users/user-list/user-list.component.html

@@ -1,7 +1,11 @@
-<div class="row">
+<div class="sub-header">
-  <div class="content-padding">
+  <div class="admin-sub-title">Users list</div>
 
-    <h3>Users list</h3>
+  <a class="add-button" routerLink="/admin/users/add">
+    <span class="icon icon-add"></span>
+    Add user
+  </a>
+</div>
 
 <p-dataTable
     [value]="users" [lazy]="true" [paginator]="true" [totalRecords]="totalRecords" [rows]="rowsPerPage"
@@ -26,10 +30,3 @@
     </ng-template>
   </p-column>
 </p-dataTable>
-
-    <a class="add-user btn btn-success pull-right" [routerLink]="['/admin/users/add']">
-      <span class="glyphicon glyphicon-plus"></span>
-      Add user
-    </a>
-  </div>
-</div>

client/src/app/+admin/users/user-list/user-list.component.scss

@@ -1,3 +1,21 @@
-.add-user {
+.sub-header {
-  margin-top: 10px;
+  display: flex;
+  align-items: center;
+  margin-bottom: 30px;
+
+  .admin-sub-title {
+    flex-grow: 1;
+  }
+
+  .add-button {
+    @include peertube-button-link;
+    @include orange-button;
+
+    .icon.icon-add {
+      @include icon(22px);
+
+      margin-right: 3px;
+      background-image: url('../../../../assets/images/admin/add.svg');
+    }
+  }
 }

client/src/app/app.component.html

@@ -19,8 +19,7 @@
     <div class="title-menu-left">
 
       <div class="title-menu-left-block menu">
-        <my-menu *ngIf="isMenuDisplayed && isInAdmin() === false"></my-menu>
+        <my-menu *ngIf="isMenuDisplayed"></my-menu>
-        <my-menu-admin *ngIf="isMenuDisplayed && isInAdmin() === true"></my-menu-admin>
       </div>
     </div>
 

client/src/app/app.module.ts

@@ -20,7 +20,7 @@ import { LoginModule } from './login'
 import { SignupModule } from './signup'
 import { SharedModule } from './shared'
 import { VideosModule } from './videos'
-import { MenuComponent, MenuAdminComponent } from './menu'
+import { MenuComponent } from './menu'
 import { HeaderComponent } from './header'
 
 export function metaFactory (): MetaLoader {
@@ -52,7 +52,6 @@ const APP_PROVIDERS = [
     AppComponent,
 
     MenuComponent,
-    MenuAdminComponent,
     HeaderComponent
   ],
   imports: [

client/src/app/header/header.component.scss

@@ -27,10 +27,9 @@
   margin-right: 25px;
 
   .icon.icon-upload {
-    display: inline-block;
+    @include icon(22px);
-    background: url('../../assets/images/header/upload.svg') no-repeat;
+
-    background-size: contain;
+    background-image: url('../../assets/images/header/upload.svg');
-    width: 22px;
     height: 24px;
     vertical-align: middle;
     margin-right: 6px;

client/src/app/menu/index.ts

@@ -1,2 +1 @@
 export * from './menu.component'
-export * from './menu-admin.component'

client/src/app/menu/menu-admin.component.html

@@ -1,35 +0,0 @@
-<menu>
-  <div class="panel-block">
-    <a *ngIf="hasUsersRight()" routerLink="/admin/users" routerLinkActive="active">
-      <span class="hidden-xs glyphicon glyphicon-user"></span>
-      List users
-    </a>
-
-    <a *ngIf="hasServerFollowRight()" routerLink="/admin/follows" routerLinkActive="active">
-      <span class="hidden-xs glyphicon glyphicon-cloud"></span>
-      Manage follows
-    </a>
-
-    <a *ngIf="hasVideoAbusesRight()" routerLink="/admin/video-abuses" routerLinkActive="active">
-      <span class="hidden-xs glyphicon glyphicon-alert"></span>
-      Video abuses
-    </a>
-
-    <a *ngIf="hasVideoBlacklistRight()" routerLink="/admin/video-blacklist" routerLinkActive="active">
-      <span class="hidden-xs glyphicon glyphicon-eye-close"></span>
-      Video blacklist
-    </a>
-
-    <a *ngIf="hasJobsRight()" routerLink="/admin/jobs" routerLinkActive="active">
-      <span class="hidden-xs glyphicon glyphicon-tasks"></span>
-      Jobs
-    </a>
-  </div>
-
-  <div class="panel-block">
-    <a routerLink="/videos/list" routerLinkActive="active">
-      <span class="hidden-xs glyphicon glyphicon-cog"></span>
-      Quit admin.
-    </a>
-  </div>
-</menu>

client/src/app/menu/menu-admin.component.ts

@@ -1,33 +0,0 @@
-import { Component } from '@angular/core'
-
-import { AuthService } from '../core/auth/auth.service'
-import { UserRight } from '../../../../shared'
-
-@Component({
-  selector: 'my-menu-admin',
-  templateUrl: './menu-admin.component.html',
-  styleUrls: [ './menu.component.scss' ]
-})
-export class MenuAdminComponent {
-  constructor (private auth: AuthService) {}
-
-  hasUsersRight () {
-    return this.auth.getUser().hasRight(UserRight.MANAGE_USERS)
-  }
-
-  hasServerFollowRight () {
-    return this.auth.getUser().hasRight(UserRight.MANAGE_SERVER_FOLLOW)
-  }
-
-  hasVideoAbusesRight () {
-    return this.auth.getUser().hasRight(UserRight.MANAGE_VIDEO_ABUSES)
-  }
-
-  hasVideoBlacklistRight () {
-    return this.auth.getUser().hasRight(UserRight.MANAGE_VIDEO_BLACKLIST)
-  }
-
-  hasJobsRight () {
-    return this.auth.getUser().hasRight(UserRight.MANAGE_JOBS)
-  }
-}

client/src/app/videos/+video-edit/shared/video-description.component.scss

@@ -5,37 +5,3 @@ textarea {
   font-size: 15px;
   height: 150px;
 }
-
-.previews /deep/ {
-  font-size: 15px !important;
-
-  .nav {
-    margin-top: 10px;
-    font-size: 16px !important;
-    border: none !important;
-
-    .nav-item .nav-link {
-      color: #000 !important;
-      height: 30px !important;
-      margin-right: 30px;
-      padding: 0 15px;
-      display: flex;
-      align-items: center;
-      border-radius: 3px;
-      border: none !important;
-
-      &.active, &:hover {
-        background-color: #F0F0F0;
-      }
-
-      &.active {
-        font-weight: $font-semibold !important;
-      }
-    }
-  }
-
-  .tab-content {
-    min-height: 75px;
-    padding: 15px;
-  }
-}

client/src/assets/images/admin/add.svg

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <defs></defs>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Artboard-4" transform="translate(-92.000000, -115.000000)">
+            <g id="2" transform="translate(92.000000, 115.000000)">
+                <circle id="Oval-1" stroke="#ffffff" stroke-width="2" cx="12" cy="12" r="10"></circle>
+                <rect id="Rectangle-1" fill="#ffffff" x="11" y="7" width="2" height="10" rx="1"></rect>
+                <rect id="Rectangle-1" fill="#ffffff" x="7" y="11" width="10" height="2" rx="1"></rect>
+            </g>
+        </g>
+    </g>
+</svg>

client/src/sass/application.scss

@@ -92,6 +92,11 @@ label {
   }
 }
 
+.admin-sub-title {
+  font-size: 20px;
+  font-weight: bold;
+}
+
 // On small screen, menu is absolute and displayed over the page
 @media screen and (max-width: 500px) {
   .title-menu-left {
@@ -132,7 +137,7 @@ label {
   to { -moz-transform: rotate(360deg);}
 }
 
-/* ngprime data table customizations */
+// ngprime data table customizations
 p-datatable {
   .action-cell {
     text-align: center;
@@ -143,6 +148,7 @@ p-datatable {
   }
 }
 
+// Bootstrap customizations
 .dropdown-menu {
   border-radius: 3px;
   box-shadow: 0 3px 6px;
@@ -167,6 +173,40 @@ p-datatable {
   }
 }
 
+.nav {
+  margin-top: 10px;
+  font-size: 16px !important;
+  border: none !important;
+
+  .nav-item .nav-link {
+    height: 30px !important;
+    margin-right: 30px;
+    padding: 0 15px;
+    display: flex;
+    align-items: center;
+    border-radius: 3px;
+    border: none !important;
+
+    &, & a {
+      color: #000 !important;
+    }
+
+    &.active, &:hover {
+      background-color: #F0F0F0;
+    }
+
+    &.active {
+      font-weight: $font-semibold !important;
+    }
+  }
+
+  .tab-content {
+    min-height: 75px;
+    padding: 15px;
+  }
+}
+
+
 .orange-button {
   @include peertube-button;
   @include orange-button;

server/tests/api/users.ts

@@ -113,7 +113,7 @@ describe('Test users', function () {
 
   it('Should upload the video with the correct token', async function () {
     const videoAttributes = {}
-    await uploadVideo(server.url, accessToken, videoAttributes, 204)
+    await uploadVideo(server.url, accessToken, videoAttributes)
     const res = await getVideosList(server.url)
     const video = res.body.data[ 0 ]
 
@@ -125,7 +125,7 @@ describe('Test users', function () {
 
   it('Should upload the video again with the correct token', async function () {
     const videoAttributes = {}
-    await uploadVideo(server.url, accessToken, videoAttributes, 204)
+    await uploadVideo(server.url, accessToken, videoAttributes)
   })
 
   it('Should retrieve a video rating', async function () {