瀏覽代碼

2018-04-25

Visman 7 年之前
父節點
當前提交
88fddab043
共有 3 個文件被更改,包括 106 次插入15 次删除
  1. 29 8
      app/Models/Pages/Admin/Users.php
  2. 1 1
      app/templates/layouts/form.forkbb.php
  3. 76 6
      public/style/ForkBB/style.css

+ 29 - 8
app/Models/Pages/Admin/Users.php

@@ -507,9 +507,12 @@ class Users extends Admin
         foreach ($users as $user) {
             ++$number;
             $fields = [];
-
+            $fields["l{$number}-wrap1"] = [
+                'class' => 'main-result',
+                'type'  => 'wrap',
+            ];
             $fields["l{$number}-username"] = [
-                'class'   => ['result'],
+                'class'   => ['result', 'username'],
                 'type'    => 'link',
                 'caption' => \ForkBB\__('Results username head'),
                 'value'   => $user->username,
@@ -517,7 +520,7 @@ class Users extends Admin
 #                'title'   => \ForkBB\__('Show posts'),
             ];
             $fields["l{$number}-email"] = [
-                'class'   => ['result'],
+                'class'   => ['result', 'email'],
                 'type'    => 'link',
                 'caption' => \ForkBB\__('Results e-mail head'),
                 'value'   => $user->email,
@@ -525,13 +528,13 @@ class Users extends Admin
 #                'title'   => \ForkBB\__('Show posts'),
             ];
             $fields["l{$number}-title"] = [
-                'class'   => ['result'],
+                'class'   => ['result', 'title'],
                 'type'    => 'str',
                 'caption' => \ForkBB\__('Results title head'),
                 'value'   => $user->title(),
             ];
             $fields["l{$number}-posts"] = [
-                'class'   => ['result'],
+                'class'   => ['result', 'posts'],
                 'type'    => $user->num_posts ? 'link' : 'str',
                 'caption' => \ForkBB\__('Results posts head'),
                 'value'   => \ForkBB\num($user->num_posts),
@@ -539,15 +542,33 @@ class Users extends Admin
                 'title'   => \ForkBB\__('Results show posts link'),
             ];
             $fields["l{$number}-note"] = [
-                'class'   => ['result'],
+                'class'   => ['result', 'note'],
                 'type'    => 'str',
                 'caption' => \ForkBB\__('Примечание админа'),
                 'value'   => $user->admin_note,
             ];
 
+            if ($this->user->isAdmin) {
+                $fields["l{$number}-view-ip"] = [
+                    'class'   => ['result', 'view-ip'],
+                    'type'    => 'link',
+#                    'caption' => \ForkBB\__('Results posts head'),
+                    'value'   => \ForkBB\__('Results view IP link'),
+                    'href'    => '',
+#                    'title'   => \ForkBB\__('Results show posts link'),
+                ];
+            }
 
-
-
+            $fields[] = [
+                'type' => 'endwrap',
+            ];
+            $fields["users[{$user->id}]"] = [
+                'class'   => ['result', 'check'],
+                'caption' => \ForkBB\__('Select'),
+                'type'    => 'checkbox',
+                'value'   => $user->id,
+                'checked' => false,
+            ];
             $form['sets']["l{$number}"] = [
                 'class'  => 'result',
                 'legend' => $number,

+ 1 - 1
app/templates/layouts/form.forkbb.php

@@ -83,7 +83,7 @@
                 @elseif ('number' === $cur['type'])
                 <input @if ($cur['required']) required @endif @if ($cur['disabled']) disabled @endif @if ($cur['autofocus']) autofocus @endif class="f-ctrl" id="id-{{ $key }}" name="{{ $key }}" type="number" min="{{ $cur['min'] }}" max="{{ $cur['max'] }}" @if (isset($cur['value'])) value="{{ $cur['value'] }}" @endif>
                 @elseif ('checkbox' === $cur['type'])
-                <label class="f-child2"><input @if ($cur['autofocus']) autofocus @endif @if ($cur['disabled']) disabled @endif type="checkbox" id="id-{{ $key }}" name="{{ $key }}" value="{{ $cur['value'] or '1' }}" @if ($cur['checked']) checked @endif>{!! $cur['label'] !!}</label>
+                <label class="f-child2"><input @if ($cur['autofocus']) autofocus @endif @if ($cur['disabled']) disabled @endif type="checkbox" id="id-{{ $key }}" name="{{ $key }}" value="{{ $cur['value'] or '1' }}" @if ($cur['checked']) checked @endif>{!! $cur['label'] or '' !!}</label>
                 @elseif ('radio' === $cur['type'])
                     @foreach ($cur['values'] as $v => $n)
                 <label class="f-label"><input @if ($cur['autofocus']) autofocus @endif @if ($cur['disabled']) disabled @endif type="radio" id="id-{{ $key }}-{{ $v }}" name="{{ $key }}" value="{{ $v }}" @if ($v == $cur['value']) checked @endif>{{ $n }}</label>

+ 76 - 6
public/style/ForkBB/style.css

@@ -2287,29 +2287,99 @@ select {
 /************************/
 .f-fs-result {
   display: flex;
-  align-items: flex-end;
+  align-items: stretch;
   min-width: 0;
+  border-bottom: 0.0625rem dotted #AA7939;
+  margin-bottom: 0.3125rem;
+  padding-bottom: 0.3125rem;
 }
 
 .f-fs-result > legend {
   display: none;
 }
 
+.f-fs-result .f-child2 > input {
+  margin: 0;
+}
+
 .f-fs-result .f-field-result {
+  border: 0;
+  margin: 0;
+}
+
+.f-wrap-main-result {
+  width: calc(100% - 3rem);
+}
+
+.f-wrap-main-result .f-field-result > dt,
+.f-wrap-main-result .f-field-result > dd,
+.f-wrap-main-result .f-field-result .f-str {
+  display: inline;
+}
+
+.f-wrap-main-result .f-field-result .f-child1 {
+  display: inline;
+  font-weight: bold;
+}
+
+.f-wrap-main-result .f-field-result .f-child1:after {
+  content: ": ";
+}
+
+.f-field-result.f-field-check {
+  width: 3rem;
+  overflow: hidden;
+  text-align: center;
+  border-left: 0.0625rem dotted #AA7939;
   display: flex;
   flex-direction: column;
 }
 
-.f-fs-result .f-field-result > dt {
+.f-field-result.f-field-check > dt {
   display: none;
 }
 
-.f-fs-result .f-field-result > dd {
-  width: 100%;
+.f-field-result.f-field-check > dd {
+  display: flex;
+  align-items: center;
+  height: 100%;
+  width: 100%
+}
+
+.f-field-result.f-field-view-ip {
+  text-align: right;
+}
+
+@media screen and (min-width: 36rem) {
+  .f-wrap-main-result .f-field-result > dt,
+  .f-wrap-main-result .f-field-result > dd {
+    display: block;
+  }
+
+  .f-wrap-main-result .f-field-result .f-child1 {
+    display: block;
+    font-weight: normal;
+  }
+
+  .f-wrap-main-result .f-field-result .f-child1:after {
+    content: "";
+  }
+}
+
+/*
+.f-fs-result .f-field-result {
+  display: flex;
+  flex-direction: column;
 }
 
-.f-fs-result:first-of-type .f-field-result > dt {
+.f-fs-result .f-field-result > dt {
   display: block;
   margin: 0;
   width: 100%;
-}
+}
+
+.f-fs-result .f-field-result > dd {
+  width: 100%;
+}
+*/
+