Merge remote-tracking branch 'origin/main'

app/admin/forms.py

@@ -104,8 +104,8 @@ class EditCommunityForm(FlaskForm):
 
 
 class EditTopicForm(FlaskForm):
-    name = StringField(_l('Name'), validators=[DataRequired()])
-    machine_name = StringField(_l('Slug'), validators=[DataRequired()])
+    name = StringField(_l('Name'), validators=[DataRequired()], render_kw={'title': _l('Human readable name for the topic.')})
+    machine_name = StringField(_l('Slug'), validators=[DataRequired()], render_kw={'title': _l('A short and unique identifier that becomes part of the URL.')})
     parent_id = SelectField(_l('Parent topic'), coerce=int, validators=[Optional()], render_kw={'class': 'form-select'})
     submit = SubmitField(_l('Save'))
 

app/static/js/markdown/downarea.css

@@ -23,8 +23,8 @@
 }
 
 .downarea {
-    background: #dbdbdb;
-    border: 1px solid #ccc;
+    background: var(--bs-body-bg);
+    border: 1px solid var(--bs-border-color);
     border-radius: 3px;
     width: auto;
     height: 150px;
@@ -38,13 +38,13 @@
 }
 
 .downarea.focused {
-    border-color: #bababa;
+    border-color: var(--bs-secondary-text-emphasis);
 }
 
 .downarea .resizer {
     width: 10px;
     height: 10px;
-    border: 5px solid #909090;
+    border: 5px solid var(--bs-secondary-color);
     border-top-color: transparent;
     border-left-color: transparent;
     border-bottom-right-radius: 3px;
@@ -72,18 +72,18 @@
 }
 
 .downarea .downarea-toolbar {
-    background: #e8e8e8;
+    background: var(--bs-secondary-bg);
     width: 100%;
     display: flex;
     justify-content: flex-start;
     align-items: center;
     padding: 5px;
-    border-bottom: 1px solid #cccccc;
+    border-bottom: 1px solid var(--bs-border-color);
     min-width: max-content !important;
 }
 
 .downarea.focused .downarea-toolbar {
-    border-bottom-color: #bababa;
+    border-bottom-color: var(--bs-secondary-text-emphasis);
 }
 
 .downarea-toolbar .downarea-toolbar-tool {
@@ -91,21 +91,22 @@
     justify-content: center;
     align-items: center;
     padding: 7px;
-    background: #fafafa;
+    background: var(--bs-light-bg-subtle);
     border-radius: 3px;
-    border: 1px solid #c2c2c2;
+    border: 1px solid var(--bs-secondary-border-subtle);
     cursor: pointer;
     margin-right: 5px;
     user-select: none;
     position: relative;
     font-size: 15px;
     font-weight: 500;
-    color: #2f2f2f;
+    color: var(--bs-emphasis-color);
 }
 
 .downarea-toolbar .downarea-toolbar-tool svg {
     width: 13px;
     opacity: 0.8;
+    fill: var(--bs-emphasis-color);
 }
 
 .downarea-toolbar .downarea-toolbar-tool:last-child {
@@ -119,7 +120,7 @@
     top: calc(100% + 2px);
     left: 0;
     z-index: 2;
-    border: 1px solid #cccccc;
+    border: 1px solid var(--bs-border-color);
     border-radius: 3px;
     overflow: auto;
     visibility: hidden;
@@ -132,7 +133,7 @@
 .downarea-toolbar .downarea-toolbar-tool .downarea-tool-dropdown ul {
     list-style-type: none;
     display: block;
-    background: #fafafa;
+    background: var(--bs-light-bg-subtle);
     cursor: default;
     padding: 3px 0;
 }
@@ -179,7 +180,7 @@
 .downarea .downarea-textarea {
     width: 100%;
     height: max-content;
-    background: #fff;
+    background: inherit;
     position: relative;
     margin-bottom: 20px;
 }
@@ -197,14 +198,14 @@
 .downarea .downarea-bottom {
     width: 100%;
     height: 19px;
-    background: #e8e8e8;
+    background: var(--bs-secondary-bg);
     position: absolute;
     bottom: 0;
     left: 0;
-    border-top: 1px solid #cccccc;
-    border-bottom: 1px solid #cccccc;
+    border-top: 1px solid var(--bs-border-color);
+    border-bottom: 1px solid var(--bs-border-color);
 }
 
 .downarea.focused .downarea-bottom {
-    border-top-color: #bababa;
+    border-top-color: var(--bs-secondary-text-emphasis);
 }

app/templates/admin/communities.html

@@ -19,10 +19,10 @@
                <th>Title</th>
                <th>Topic</th>
                <th>#&nbsp;Posts</th>
-               <th>Home</th>
-               <th>Popular</th>
-               <th>All</th>
-               <th>Warning</th>
+               <th title="{{ _('Posts show on home page.') }}">Home</th>
+               <th title="{{ _('Posts can be popular.') }}">Popular</th>
+               <th title="{{ _('Posts show in the All feed.') }}">All</th>
+               <th title="{{ _('Content warning, NSFW or NSFL set for community.') }}">Warning</th>
                <th>Actions</th>
             </tr>
             {% for community in communities.items %}

app/templates/admin/users.html

@@ -19,15 +19,15 @@
         </form>
         <table class="table table-striped mt-1">
             <tr>
-               <th>Name</th>
+               <th title="{{ _('Display name.') }}">Name</th>
                <th>Local/Remote</th>
-               <th>Seen</th>
-               <th>Attitude</th>
-               <th>Rep</th>
+               <th title="{{ _('Last seen.') }}">Seen</th>
+               <th title="{{ _('Attitude: Percentage of up votes vs. down votes the account made.') }}">Attitude</th>
+               <th title="{{ _('Reputation: The Karma of the account. Total up votes minus down votes they got.') }}">Rep</th>
                <th>Banned</th>
-               <th>Reports</th>
-               <th>IP</th>
-               <th>Source</th>
+               <th title="{{ _('How often a user has been reported.') }}">Reports</th>
+               <th title="{{ _('IP address of last interaction.') }}">IP</th>
+               <th title="{{ _('Which website linked to PieFed when the user initially registered.') }}">Source</th>
                <th>Actions</th>
             </tr>
             {% for user in users.items %}