first article

.~lock.article_final.odt#

@@ -0,0 +1 @@
+,anon,anon-pc,25.07.2022 00:28,file:///home/anon/.config/libreoffice/4;

articles/templates/articles/article.html

@@ -33,9 +33,7 @@
   <section id="news" class="news">
     <div class="container">
       <div class="row">
-        <div class="col-xl-1 col-lg-6 icon-boxes">
+        <div class="col-xl-12 col-lg-6 icon-boxes">
-        </div>
-        <div class="col-xl-10 col-lg-6 icon-boxes">
           {% if article.status == 'Pending approval' %}
             <div class="alert alert-warning">
               <strong><center>Pending approval</center></strong>
@@ -81,8 +79,6 @@
 
           </div>
         </div>
-        <div class="col-xl-1 col-lg-6 icon-boxes">
-        </div>
       </div>
 
     </div>

articles/templates/articles/articles.html

@@ -118,7 +118,7 @@
             <div class="content">
               <h3 class="link-white"><a href="../view_article/{{ article.url }}">{{ article.title }}</a></h3>
               <p class="link-white" style="text-align: justify;">
-                <b><a href="../view_article/{{ article.url }}">Article by {{ article.owner.username }}, {{ article.date_published }}</a></b><br><br>{{ article.text | safe }}
+                <b><a href="../view_article/{{ article.url }}">Article by {{ article.owner.username }}, {{ article.date_published }}</a></b><br><br>{{ article.subtitle }}<br><br>{{ article.text }}
               </p>
             </div>
           </div>
@@ -159,7 +159,7 @@
             <a href="../view_article/{{ article.url }}"><img class="card-img-top" src="{% static article.thumbnail %}"></a>
             <div class="card-body">
               <h5><a href="../view_article/{{ article.url }}">{{ article.title }}</a></h5>
-              <p>{{ article.text | safe }}</p>
+              <p><center>{{ article.subtitle | safe }}</center></p>
               <h6><b>Article by {{ article.owner.username }}, {{ article.date_published }}</b></h6>
             </div>
           </div>
@@ -199,7 +199,7 @@
             <div class="content">
               <h3 class="link-white"><a href="../view_article/{{ article.url }}">{{ article.title }}</a></h3>
               <p class="link-white" style="text-align: justify;">
-                <b><a href="../view_article/{{ article.url }}">Article by {{ article.owner.username }}, {{ article.date_published }}</a></b><br><br>{{ article.text | safe }}
+                <b><a href="../view_article/{{ article.url }}">Article by {{ article.owner.username }}, {{ article.date_published }}</a></b><br><br>{{ article.subtitle | safe }}<br><br>{{ article.text | safe }}
               </p>
             </div>
           </div>
@@ -213,7 +213,7 @@
             <a href="../view_article/{{ article.url }}"><img class="card-img-top" src="{% static article.thumbnail %}"></a>
             <div class="card-body">
               <h5><a href="../view_article/{{ article.url }}">{{ article.title }}</a></h5>
-              <p>{{ article.text | safe }}</p>
+              <p><center>{{ article.subtitle | safe }}</center></p>
               <h6><b>Article by {{ article.owner.username }}, {{ article.date_published }}</b></h6>
             </div>
           </div>

articles/views.py

@@ -34,9 +34,9 @@ def articles(request):
             article.title = article.title[:100] + '...'
         article.count = count
         if count != 5 and count != 0:
-            article.text = article.text[:400] + '...'
+            article.text = article.text[:200] + '...'
         else:
-            article.text = article.text[:600] + '...'
+            article.text = article.text[:400] + '...'
         count += 1
 
     if request.method != 'POST':
@@ -53,8 +53,6 @@ def articles(request):
         else:
             message = 'Something went wrong!'
 
-    print(thumbnail)
-
     context = {'page': 'article', 'articles': articles, 'form': form, 'message': message, 'thumbnail': thumbnail}
     return render(request, 'articles/articles.html', context)
 
@@ -132,7 +130,8 @@ def write(request):
             article.date_published = datetime.datetime.strftime(article.date_published, '%d/%m/%Y')
         except:
             pass
-        article.title = article.title[:50] + '...'
+        if len(article.title) > 60:
+            article.title = article.title[:60] + '...'
 
     if request.user.profile.type == 'editor':
         reviews = Article.objects.filter(status="Pending approval").exclude(author=request.user)
@@ -146,7 +145,8 @@ def write(request):
                 review.date_published = datetime.datetime.strftime(review.date_published, '%d/%m/%Y')
             except:
                 pass
-            review.title = review.title[:50] + '...'
+            if len(review.title) > 60:
+                review.title = review.title[:60] + '...'
         
         context = {'page': 'article', 'articles': articles, 'reviews': reviews}
 
@@ -162,7 +162,8 @@ def write(request):
                 review.date_published = datetime.datetime.strftime(review.date_published, '%d/%m/%Y')
             except:
                 pass
-            review.title = review.title[:50] + '...'
+            if len(review.title) > 60:
+                review.title = review.title[:60] + '...'
 
         published = Article.objects.filter(status="Published")
         for publish in published:
@@ -175,7 +176,8 @@ def write(request):
                 publish.date_published = datetime.datetime.strftime(publish.date_published, '%d/%m/%Y')
             except:
                 pass
-            publish.title = publish.title[:50] + '...'
+            if len(publish.title) > 60:
+                publish.title = publish.title[:60] + '...'
         
         context = {'page': 'article', 'articles': articles, 'reviews': reviews, 'published': published}
     

charts/templates/charts/base.html

@@ -238,7 +238,7 @@
                 <a class="nav-link collapsed" href="#" data-toggle="collapse" data-target="#collapseMining"
                     aria-expanded="true" aria-controls="collapseMining">
                     <i class="bx bx-calculator"></i>
-                    <span>Mining (14)</span>
+                    <span>Mining (16)</span>
                 </a>
                 <div id="collapseMining" class="collapse" aria-labelledby="headingMining"
                     data-parent="#accordionSidebar">
@@ -258,6 +258,11 @@
                         <a class="collapse-item" href="{% url 'charts:blockchainsize' %}">Blockchain Size (Bytes)</a>
                         <a class="collapse-item" href="{% url 'charts:transactionsize' %}">Transaction Size (Bytes)</a>
                         <a class="collapse-item" href="{% url 'charts:difficulty' %}">Mining Difficulty</a>
+                        <a class="collapse-item" href="{% url 'charts:securitybudget' %}">Security Budget</a>
+                        <a class="collapse-item" href="{% url 'charts:efficiency' %}">Breakeven Efficiency</a>
+                        <!--
+                        <a class="collapse-item" href="{% url 'charts:difficulty' %}">Reward / Hashrate</a>
+                        -->
                     </div>
                 </div>
             </li>
@@ -351,14 +356,14 @@
                 <a class="nav-link collapsed" href="#" data-toggle="collapse" data-target="#collapseOthers"
                     aria-expanded="true" aria-controls="collapseOthers">
                     <i class="bx bx-info-circle"></i>
-                    <span>About Us</span>
+                    <span>About Us (1)</span>
                 </a>
                 <div id="collapseOthers" class="collapse" aria-labelledby="headingOthers"
                     data-parent="#accordionSidebar">
                     <div class="py-2 collapse-inner rounded">
                         <h6 class="collapse-header text-dark">Info:</h6>
                         <a class="collapse-item" href="{% url 'charts:about' %}">About Us</a>
-                        <!--<a class="collapse-item" href="{% url 'charts:pageviews' %}">Moneroj.net Pageviews</a>-->
+                        <a class="collapse-item" href="{% url 'charts:pageviews' %}">Pageviews</a>
                         <a class="collapse-item" href="https://twitter.com/CryptoMorpheus_" target="_blank">Twitter</a>
                     </div>
                 </div>

charts/templates/charts/index.html

@@ -102,12 +102,12 @@
                 </div>
                 <div class="col">
                   <p style="text-align: right;">
-                    <i class="bx bx-money"></i> Raised 2.30 of 46 XMR
+                    <i class="bx bx-money"></i> Raised 5.41 of 46 XMR
                   </p>
                 </div>
               </div>
               <div class="progress">
-                <div class="progress-bar bg-danger" role="progressbar" style="width: 5%; color: #ff4d21" aria-valuenow="2.3035" aria-valuemin="0" aria-valuemax="46"></div>
+                <div class="progress-bar bg-danger" role="progressbar" style="width: 12%; color: #ff4d21" aria-valuenow="5.41" aria-valuemin="0" aria-valuemax="46"></div>
               </div>
             </div>
           </div>
@@ -140,12 +140,12 @@
                     </div>
                     <div class="col">
                       <p style="text-align: right;">
-                        <i class="bx bx-money"></i> Raised 2.30 of 46 XMR
+                        <i class="bx bx-money"></i> Raised 5.41 of 46 XMR
                       </p>
                     </div>
                   </div>
                   <div class="progress">
-                    <div class="progress-bar bg-danger" role="progressbar" style="width: 5%; color: #ff4d21" aria-valuenow="2.3035" aria-valuemin="0" aria-valuemax="46"></div>
+                    <div class="progress-bar bg-danger" role="progressbar" style="width: 12%; color: #ff4d21" aria-valuenow="5.41" aria-valuemin="0" aria-valuemax="46"></div>
                   </div>
                 </div>
               </div>

charts/templates/charts/pageviews.html

@@ -117,8 +117,8 @@
         x: {{ dates|safe }},
         y: {{ unique|safe }},
         line: {
-            color: '#777777'
+            color: '#1dddcd'
-            ,width: 1
+            ,width: 2
         }
     };
     
@@ -129,8 +129,8 @@
         x: {{ dates|safe }},
         y: {{ unique|safe }},
         line: {
-            color: '#777777'
+            color: '#1dddcd'
-            ,width: 1
+            ,width: 2
         }
     }; 
     
@@ -144,9 +144,9 @@ var layout = {
     {
         xref: 'paper',
         yref: 'paper',
-        x: 0.02,
+        x: 0.98,
         xanchor: 'auto',
-        y: 0.50,
+        y: 0.98,
         yanchor: 'auto',
         text: 'Moneroj<br>https://www.moneroj.net',
         showarrow: false,
@@ -162,8 +162,8 @@ var layout = {
     }],
     separators: ",.",
     legend: {
-        x: 0.02, 
+        x: 0.98, 
-        y: 0.02, 
+        y: 0.50, 
         bgcolor: '#333333', 
         bordercolor: '#5f5f5f', 
         borderwidth: 1, 
@@ -208,8 +208,8 @@ var layout = {
         ,zeroline: true
     },
     margin: {
-        l: 120,
+        l: 80,
-        r: 120,
+        r: 30,
         b: 35,
         t: 10,
         pad: 10
@@ -224,7 +224,7 @@ var layout_mobile = {
         namelength: -1
     },
     legend: {
-        x: 0.02, 
+        x: 0.98, 
         y: 0.98, 
         bgcolor: '#000000', 
         bordercolor: '#5f5f5f',