FIX: css

2021-04-11 08:55:52 +03:00 · 2021-04-11 08:55:52 +03:00 · b44627e3a5
parent 71b1c00332
commit b44627e3a5
23 changed files with 160 additions and 21 deletions
--- a/app/Controllers/CommentController.php
+++ b/app/Controllers/CommentController.php
@ -196,7 +196,7 @@ class CommentController extends \MainController
            'description' => 'Страница комментариев учасника ' . $login . ' на сайте ' . $GLOBALS['conf']['sitename'],
        ]; 
        
-        return view("comment/commuser", ['data' => $data, 'uid' => $uid, 'comments' => $result]);
+        return view("comment/comm-user", ['data' => $data, 'uid' => $uid, 'comments' => $result]);
    }

    // Удаление комментария
--- a/app/Controllers/PostController.php
+++ b/app/Controllers/PostController.php
@ -289,7 +289,7 @@ class PostController extends \MainController
            'description'   => 'Посты участника ' . $login . ' с сообществе ' . $GLOBALS['conf']['sitename'],
        ]; 
        
-        return view("post/user", ['data' => $data, 'uid' => $uid, 'posts' => $result]);
+        return view("post/post-user", ['data' => $data, 'uid' => $uid, 'posts' => $result]);
    }
    
    // Форма добавление поста
--- a/app/Language/ru/lang.php
+++ b/app/Language/ru/lang.php
@ -25,7 +25,8 @@ return [
    'Statistics'        => 'Статистика',
    'Privacy'           => 'Конфедициальность',
    'About'             => 'О нас',
-    'Info'              => 'Информация',
+    'Info'              => 'Информация',  
+    'Trust level'       => 'Уровень доверия',
    'Search'            => 'Поиск',
    'Users'             => 'Участники',
    'Page'              => 'Страница',
--- a/database/dev.sql
+++ b/database/dev.sql
@ -204,7 +204,7 @@ CREATE TABLE `users` (
  `id` int(11) NOT NULL,
  `login` varchar(50) NOT NULL,
  `name` varchar(50) DEFAULT NULL,
-  `email` varchar(50) NOT NULL,
+  `email` varchar(100) NOT NULL,
  `password` varchar(255) NOT NULL,
  `activated` tinyint(1) NOT NULL,
  `reg_ip` varchar(15) DEFAULT NULL,
@ -376,7 +376,7 @@ CREATE TABLE `invitation` (
  `invitation_id` int(10) UNSIGNED NOT NULL,
  `uid` int(11) DEFAULT '0',
  `invitation_code` varchar(32) DEFAULT NULL,
-  `invitation_email` varchar(255) DEFAULT NULL,
+  `invitation_email` varchar(100) DEFAULT NULL,
  `add_time` datetime NOT NULL,
  `add_ip` varchar(12) DEFAULT NULL,
  `active_expire` tinyint(1) DEFAULT '0',
@ -393,7 +393,6 @@ ALTER TABLE `invitation`
  ADD PRIMARY KEY (`invitation_id`),
  ADD KEY `uid` (`uid`),
  ADD KEY `invitation_code` (`invitation_code`),
-  ADD KEY `invitation_email` (`invitation_email`),
  ADD KEY `active_time` (`active_time`),
  ADD KEY `active_ip` (`active_ip`),
  ADD KEY `active_status` (`active_status`);
--- a/public/assets/css/admin.css
+++ b/public/assets/css/admin.css
@ -1,6 +1,6 @@
 .admin {
-  grid-column-start: 1;
-  grid-column-end: 4;
+  grid-column-start: 2;
+  grid-column-end: 5;
  background: #fff;
  padding: 0.4rem 0.5rem;
 }
--- a/public/assets/css/style.css
+++ b/public/assets/css/style.css
@ -80,7 +80,7 @@ main {
  font-size:11px;
  margin: 2px 0;
 }
-.profiles, .post, .stats {
+.profiles, .post, .w-100 {
  grid-column-start: 2;
  grid-column-end: 5;
  padding: 0.4rem 0.5rem;
@ -123,6 +123,14 @@ h1.head {
  text-transform: uppercase;
  letter-spacing: 1px;
 }
+h1.space {
+  font-size: 16px;
+  margin: 0 0 0 68px;
+  letter-spacing: 1px;
+}
+h1.space a {
+  color: #2562dc;
+}
 pre code {
  background: #272822;
  color: var(--color-white);
@ -977,6 +985,7 @@ div.voters .comm-up-id, div.voters .post-up-id {
  margin: 50px 16px 5px 10px;
 }

+/* Меню */
 menu {
  grid-area: menu;
  padding: 0 8px;
@ -989,6 +998,9 @@ menu a {
  margin-bottom: 5px;
  color: #888;
 }
+menu a.menu:hover > .md-icon {
+  stroke: #2562dc;
+}
 a.menu.active {
  color:#333;
 }
--- a/resources/views/admin/header_admin.php
+++ b/resources/views/admin/header_admin.php
@ -53,7 +53,7 @@
            </ul>
        </div>
    </div>
-    <div class="menu">
+    <div class="menu-h">
        <ul>

            <?php if(!$uid['id']) { ?> 
--- a/resources/views/auth/login.php
+++ b/resources/views/auth/login.php
@ -1,5 +1,5 @@
 <?php include TEMPLATE_DIR . '/header.php'; ?>
-<main>
+<main class="w-100">
    <div class="left-ots">
        <h1 class="head"><?= $data['h1']; ?></h1>
        <div class="box wide">
--- a/resources/views/auth/recover.php
+++ b/resources/views/auth/recover.php
@ -1,5 +1,5 @@
 <?php include TEMPLATE_DIR . '/header.php'; ?>
-<main>
+<main class="w-100">
    <div class="left-ots">
        <h1 class="head"><?= $data['h1']; ?></h1>
        <div class="box wide">
--- a/resources/views/auth/register-invate.php
+++ b/resources/views/auth/register-invate.php
@ -1,5 +1,5 @@
 <?php include TEMPLATE_DIR . '/header.php'; ?>
-<main>
+<main class="w-100">
    <div class="left-ots">
        <h1 class="head"><?= $data['h1']; ?></h1>
        <div class="box wide">
--- a/resources/views/auth/register.php
+++ b/resources/views/auth/register.php
@ -1,5 +1,5 @@
 <?php include TEMPLATE_DIR . '/header.php'; ?>
-<main>
+<main class="w-100">
    <div class="left-ots">
        <h1 class="head"><?= $data['h1']; ?></h1>
        <div class="box wide">
--- a/resources/views/comment/comm-user.php
+++ b/resources/views/comment/comm-user.php
@ -0,0 +1,51 @@
+<?php include TEMPLATE_DIR . '/header.php'; ?>
+<main class="w-100">
+    <div class="left-ots">
+
+        <h1 class="top"><?php echo $data['h1']; ?></h1>
+
+        <?php if (!empty($comments)) { ?>
+   
+            <?php foreach ($comments as $comm) { ?> 
+            
+                <?php if($comm['comment_del'] == 0) { ?>
+                    <div class="comm-telo_bottom">
+                        <div class="voters">
+                            <div class="comm-up-id"></div>
+                            <div class="score"><?php echo $comm['comment_votes']; ?></div>
+                        </div>
+
+                        <div class="comm-telo">
+                            <div class="comm-header">
+                                <img class="ava" alt="<?php echo $comm['login']; ?>" src="/uploads/avatar/small/<?php echo $comm['avatar']; ?>">
+                                <span class="user"> 
+                                    <a href="/u/<?php echo $comm['login']; ?>"><?php echo $comm['login']; ?></a> 
+                                    
+                                    <?php echo $comm['date']; ?>
+                                </span> 
+             
+                                <span class="otst"> | </span>
+                                <span class="date">  
+                                   <a href="/posts/<?= $comm['post_slug']; ?>"><?php echo $comm['post_title']; ?></a>
+                                </span>
+                            </div>
+                            <div class="comm-telo-body">
+                                <?php echo $comm['content']; ?> 
+                            </div>
+                        </div>
+                    </div>  
+                <?php } else { ?>    
+                    <div class="dell comm-telo_bottom"> 
+                        <div class="voters"></div>
+                        ~ Комментарий удален
+                    </div>
+                <?php } ?>     
+                        
+            <?php } ?>
+
+        <?php } else { ?>
+            <div class="no-content"><?= lang('no-comment'); ?>...</div>
+        <?php } ?>
+    </div>    
+</main> 
+<?php include TEMPLATE_DIR . '/footer.php'; ?>
--- a/resources/views/header.php
+++ b/resources/views/header.php
@ -36,6 +36,11 @@
                        </svg>
                    </div>
                </li>
+                <?php if(!empty($space)) { ?>
+                    <li class="nav no-mob"> 
+                        <h1 class="space"> <a href="">~  <?= $space['space_name']; ?></a></h1>
+                    </li>
+                <?php } ?> 
            </ul>
        </div>
    </div>
--- a/resources/views/info/menu.php
+++ b/resources/views/info/menu.php
@ -4,6 +4,7 @@
        <a class="info-n<?php if($uri == '/info') { ?> active<?php } ?>" href="/info">~ <?= lang('Info'); ?></a>
        <a class="info-n<?php if($uri == '/info/privacy') { ?> active<?php } ?>" href="/info/privacy">~ <?= lang('Privacy'); ?></a>
        <a class="info-n<?php if($uri == '/info/markdown') { ?> active<?php } ?>" href="/info/markdown">~ <?= lang('Мarkdown'); ?></a> 
+        <a class="info-n<?php if($uri == '/info/trust-level') { ?> active<?php } ?>" href="/info/trust-level">~ <?= lang('Trust level'); ?> (TL)</a>
        <a class="info-n<?php if($uri == '/info/about') { ?> active<?php } ?>" href="/info/about">~ <?= lang('About'); ?></a>
        <div class="v-ots"></div>
        <a class="info-n<?php if($uri == '/info/stats') { ?> active<?php } ?>" href="/info/stats">~ <?= lang('Statistics'); ?></a>
--- a/resources/views/info/stats.php
+++ b/resources/views/info/stats.php
@ -1,7 +1,7 @@
 <?php include TEMPLATE_DIR . '/header.php'; ?>
 <link rel="stylesheet" href="/assets/css/info.css"> 
 <script src="/assets/js/canvas.js"></script>
-<div class="stats">
+<div class="w-100">
    <ul class="breadcrumb">
        <li class="breadcrumb-item">
            <a title="<?= lang('Home'); ?>" href="/"><?= lang('Home'); ?></a>
--- a/resources/views/info/trust-level.php
+++ b/resources/views/info/trust-level.php
@ -1,4 +1,5 @@
 <?php include TEMPLATE_DIR . '/header.php'; ?>
+<?php include TEMPLATE_DIR . '/menu.php'; ?>
 <main class="info">
    <div class="left-ots max-width">
        <ul class="breadcrumb">
--- a/resources/views/post/post-user.php
+++ b/resources/views/post/post-user.php
@ -0,0 +1,66 @@
+<?php include TEMPLATE_DIR . '/header.php'; ?>
+<main class="w-100">
+    <div class="left-ots">
+
+        <h1 class="top"><?php echo $data['h1']; ?></h1>
+
+        <div class="telo posts">
+            <?php if (!empty($posts)) { ?>
+          
+                <?php foreach ($posts as $post) { ?> 
+              
+                    <?php if (!$uid['id']) { ?> 
+                        <div id="vot<?= $post['post_id']; ?>" class="voters">
+                            <a rel="nofollow" href="/login"><div class="post-up-id"></div></a>
+                            <div class="score"><?= $post['post_votes']; ?></div>
+                        </div>
+                    <?php } else { ?> 
+                        <?php if ($post['votes_post_user_id'] || $uid['id'] == $post['post_user_id']) { ?>
+                            <div class="voters active">
+                                <div class="post-up-id"></div>
+                                <div class="score"><?= $post['post_votes']; ?></div>
+                            </div>
+                        <?php } else { ?>
+                            <div id="up<?= $post['post_id']; ?>" class="voters">
+                                <div data-id="<?= $post['post_id']; ?>" class="post-up-id"></div>
+                                <div class="score"><?= $post['post_votes']; ?></div>
+                            </div>
+                        <?php } ?> 
+                    <?php } ?> 
+                
+                    <div class="post-telo">
+                        <a class="u-url" href="/posts/<?php echo $post['post_slug']; ?>">
+                            <h3 class="titl"><?php echo $post['post_title']; ?></h3>
+                        </a>
+                        
+                        <a class="space space_<?= $post['space_tip'] ?>" href="/s/<?= $post['space_slug']; ?>" title="<?= $post['space_name']; ?>">
+                            <?= $post['space_name']; ?>
+                        </a>
+                        
+                        <div class="footer">
+                            <img class="ava" src="/uploads/avatar/small/<?php echo $post['avatar']; ?>">
+                            <span class="user"> 
+                                <a href="/u/<?php echo $post['login']; ?>"><?php echo $post['login']; ?></a> 
+                            </span>
+                            <span class="date"> 
+                                <?php echo $post['post_date']; ?>
+                            </span>
+                            <?php if($post['post_comments'] !=0) { ?> 
+                                <span class="otst"> | </span>
+                                комментариев (<?php echo $post['post_comments'] ?>) 
+                                 
+                            <?php } ?>
+                        </div>  
+                    </div>
+           
+                <?php } ?>
+
+            <?php } else { ?>
+
+                <div class="no-content"><?= lanf('no-post'); ?>...</div>
+
+            <?php } ?>
+        </div> 
+    </div>
+</main>
+<?php include TEMPLATE_DIR . '/footer.php'; ?> 
--- a/resources/views/space/spaceposts.php
+++ b/resources/views/space/spaceposts.php
@ -2,7 +2,6 @@
 <?php include TEMPLATE_DIR . '/menu.php'; ?>
 <main>
    <div class="left-ots">
-        <h1 class="left-ots"><span>~</span> <?= $data['h1']; ?></h1>
        <?php if (!empty($posts)) { ?>
        
            <?php foreach ($posts as  $post) { ?> 
@ -77,6 +76,10 @@
    <div class="space-text">
        <img class="space-img" src="/uploads/space/<?= $space['space_img']; ?>">
    
+        <?php print_r($space); ?>
+   
+    <?= $space['space_name']; ?>
+    
        <?= $space['space_text']; ?>
    
        <?php if($uid['trust_level'] == 5) { ?>
--- a/resources/views/user/favorite.php
+++ b/resources/views/user/favorite.php
@ -1,5 +1,5 @@
 <?php include TEMPLATE_DIR . '/header.php'; ?>
-<main>
+<main class="w-100">
    <div class="left-ots">

        <h1><?= $data['h1']; ?></h1>
--- a/resources/views/user/invitation.php
+++ b/resources/views/user/invitation.php
@ -1,5 +1,5 @@
 <?php include TEMPLATE_DIR . '/header.php'; ?>
-<main class="users">
+<main class="w-100">
    <div class="left-ots">
        <div class="box-users">
            <h1><?= $data['h1']; ?></h1>
--- a/resources/views/user/setting-avatar.php
+++ b/resources/views/user/setting-avatar.php
@ -1,5 +1,5 @@
 <?php include TEMPLATE_DIR . '/header.php'; ?>
-<main>
+<main class="w-100">
    <div class="left-ots">
        <a class="right" href="/u/<?php echo $uid['login']; ?>">Посмотреть профиль</a>
        <ul class="nav-tabs">
--- a/resources/views/user/setting-security.php
+++ b/resources/views/user/setting-security.php
@ -1,5 +1,5 @@
 <?php include TEMPLATE_DIR . '/header.php'; ?>
-<main>
+<main class="w-100">
    <div class="left-ots">
        <a class="right" href="/u/<?= $data['login']; ?>">Посмотреть профиль</a>
        <ul class="nav-tabs">
--- a/resources/views/user/setting.php
+++ b/resources/views/user/setting.php
@ -1,5 +1,5 @@
 <?php include TEMPLATE_DIR . '/header.php'; ?>
-<main>
+<main class="w-100">
    <div class="left-ots">
        <a class="right" href="/u/<?php echo $data['login']; ?>">Посмотреть профиль</a>