wip
This commit is contained in:
pika
parent
7dafc3c1e4
commit
72dac49878
7 changed files with 119 additions and 239 deletions
|
|
@ -57,6 +57,15 @@ def github_style_admonition(text):
|
|||
return '\n'.join(result_lines)
|
||||
|
||||
|
||||
# Register template filters
|
||||
@bp.app_template_filter('github_style_admonition')
|
||||
def github_style_admonition_filter(text):
|
||||
"""Template filter version of github_style_admonition"""
|
||||
if text is None:
|
||||
return ""
|
||||
return github_style_admonition(text)
|
||||
|
||||
|
||||
@bp.app_template_filter("markdown")
|
||||
def markdown_filter(text):
|
||||
"""Convert markdown text to HTML with proper GitHub styling for all elements"""
|
||||
|
|
|
|||
|
|
@ -488,14 +488,62 @@
|
|||
margin-right: 0.25rem;
|
||||
}
|
||||
|
||||
/* Add compatibility classes for GitHub markdown */
|
||||
.markdown-content .markdown-reading-view {
|
||||
/* Integration with GitHub markdown classes */
|
||||
.markdown-content .markdown-reading-view,
|
||||
.markdown-content .markdown-source-view {
|
||||
width: 100%;
|
||||
color: var(--markdown-text);
|
||||
background-color: var(--markdown-bg);
|
||||
background-color: transparent;
|
||||
}
|
||||
|
||||
[data-bs-theme="dark"] .markdown-content .markdown-reading-view {
|
||||
/* Ensure markdown content adapts to theme */
|
||||
.markdown-content {
|
||||
color: var(--markdown-text);
|
||||
background-color: var(--markdown-bg);
|
||||
background-color: transparent;
|
||||
}
|
||||
|
||||
/* Application Card Styling */
|
||||
.app-card {
|
||||
background-color: var(--card-bg);
|
||||
border: 1px solid var(--border-color);
|
||||
border-radius: 0.375rem;
|
||||
overflow: hidden;
|
||||
margin-bottom: 1rem;
|
||||
}
|
||||
|
||||
.app-card-header {
|
||||
background-color: rgba(0, 0, 0, 0.03);
|
||||
border-bottom: 1px solid var(--border-color);
|
||||
padding: 0.75rem 1rem;
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
[data-bs-theme="dark"] .app-card-header {
|
||||
background-color: rgba(255, 255, 255, 0.03);
|
||||
}
|
||||
|
||||
.app-card-body {
|
||||
padding: 1rem;
|
||||
}
|
||||
|
||||
.app-card-footer {
|
||||
border-top: 1px solid var(--border-color);
|
||||
padding: 0.5rem 1rem;
|
||||
background-color: rgba(0, 0, 0, 0.01);
|
||||
}
|
||||
|
||||
[data-bs-theme="dark"] .app-card-footer {
|
||||
background-color: rgba(255, 255, 255, 0.01);
|
||||
}
|
||||
|
||||
.app-link {
|
||||
color: var(--text-color);
|
||||
text-decoration: none;
|
||||
font-weight: 600;
|
||||
}
|
||||
|
||||
.app-link:hover {
|
||||
color: var(--highlight-color);
|
||||
}
|
||||
|
|
@ -1,195 +0,0 @@
|
|||
/* Enhanced Markdown Styling */
|
||||
.markdown-content {
|
||||
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Helvetica, Arial, sans-serif;
|
||||
font-size: 16px;
|
||||
line-height: 1.6;
|
||||
word-wrap: break-word;
|
||||
color: #24292e;
|
||||
}
|
||||
|
||||
.markdown-content h1,
|
||||
.markdown-content h2,
|
||||
.markdown-content h3,
|
||||
.markdown-content h4,
|
||||
.markdown-content h5,
|
||||
.markdown-content h6 {
|
||||
margin-top: 24px;
|
||||
margin-bottom: 16px;
|
||||
font-weight: 600;
|
||||
line-height: 1.25;
|
||||
}
|
||||
|
||||
.markdown-content h1 {
|
||||
font-size: 2em;
|
||||
border-bottom: 1px solid #eaecef;
|
||||
padding-bottom: .3em;
|
||||
}
|
||||
|
||||
.markdown-content h2 {
|
||||
font-size: 1.5em;
|
||||
border-bottom: 1px solid #eaecef;
|
||||
padding-bottom: .3em;
|
||||
}
|
||||
|
||||
.markdown-content h3 {
|
||||
font-size: 1.25em;
|
||||
}
|
||||
|
||||
.markdown-content h4 {
|
||||
font-size: 1em;
|
||||
}
|
||||
|
||||
.markdown-content p {
|
||||
margin-top: 0;
|
||||
margin-bottom: 16px;
|
||||
}
|
||||
|
||||
.markdown-content blockquote {
|
||||
padding: 0 1em;
|
||||
color: #6a737d;
|
||||
border-left: 0.25em solid #dfe2e5;
|
||||
margin: 0 0 16px 0;
|
||||
}
|
||||
|
||||
.markdown-content pre {
|
||||
padding: 16px;
|
||||
overflow: auto;
|
||||
font-size: 85%;
|
||||
line-height: 1.45;
|
||||
background-color: #f6f8fa;
|
||||
border-radius: 3px;
|
||||
margin-bottom: 16px;
|
||||
}
|
||||
|
||||
.markdown-content code {
|
||||
padding: 0.2em 0.4em;
|
||||
margin: 0;
|
||||
font-size: 85%;
|
||||
background-color: rgba(27, 31, 35, 0.05);
|
||||
border-radius: 3px;
|
||||
}
|
||||
|
||||
.markdown-content pre code {
|
||||
background-color: transparent;
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
.markdown-content table {
|
||||
border-spacing: 0;
|
||||
border-collapse: collapse;
|
||||
margin-bottom: 16px;
|
||||
width: 100%;
|
||||
overflow: auto;
|
||||
}
|
||||
|
||||
.markdown-content table th,
|
||||
.markdown-content table td {
|
||||
padding: 6px 13px;
|
||||
border: 1px solid #dfe2e5;
|
||||
}
|
||||
|
||||
.markdown-content table tr {
|
||||
background-color: #fff;
|
||||
border-top: 1px solid #c6cbd1;
|
||||
}
|
||||
|
||||
.markdown-content table tr:nth-child(2n) {
|
||||
background-color: #f6f8fa;
|
||||
}
|
||||
|
||||
/* GitHub-style alerts */
|
||||
.markdown-alert {
|
||||
padding: 0.5rem 1rem;
|
||||
margin-bottom: 16px;
|
||||
border-radius: 6px;
|
||||
}
|
||||
|
||||
.markdown-alert p {
|
||||
margin-top: 0;
|
||||
margin-bottom: 0;
|
||||
}
|
||||
|
||||
.markdown-alert p:first-of-type {
|
||||
margin-top: 8px;
|
||||
}
|
||||
|
||||
.markdown-alert-title {
|
||||
font-weight: bold;
|
||||
margin-bottom: 8px;
|
||||
}
|
||||
|
||||
.markdown-alert-note {
|
||||
background-color: #f1f8ff;
|
||||
border-left: 4px solid #58a6ff;
|
||||
}
|
||||
|
||||
.markdown-alert-tip {
|
||||
background-color: #dafbe1;
|
||||
border-left: 4px solid #2da44e;
|
||||
}
|
||||
|
||||
.markdown-alert-important {
|
||||
background-color: #fff8c5;
|
||||
border-left: 4px solid #bf8700;
|
||||
}
|
||||
|
||||
.markdown-alert-warning {
|
||||
background-color: #fff8c5;
|
||||
border-left: 4px solid #bf8700;
|
||||
}
|
||||
|
||||
.markdown-alert-caution {
|
||||
background-color: #ffebe9;
|
||||
border-left: 4px solid #cf222e;
|
||||
}
|
||||
|
||||
/* Add this to ensure consistent display of markdown content */
|
||||
.markdown-body {
|
||||
color: inherit;
|
||||
font-family: inherit;
|
||||
}
|
||||
|
||||
.markdown-content {
|
||||
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Helvetica, Arial, sans-serif;
|
||||
line-height: 1.6;
|
||||
color: #24292e;
|
||||
overflow-wrap: break-word;
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
.markdown-content h1:first-child,
|
||||
.markdown-content h2:first-child,
|
||||
.markdown-content h3:first-child,
|
||||
.markdown-content h4:first-child,
|
||||
.markdown-content h5:first-child,
|
||||
.markdown-content h6:first-child {
|
||||
margin-top: 0;
|
||||
}
|
||||
|
||||
/* Additional styling for consistency in all views */
|
||||
.markdown-content pre,
|
||||
.markdown-body pre {
|
||||
background-color: #f6f8fa;
|
||||
border-radius: 3px;
|
||||
padding: 16px;
|
||||
overflow: auto;
|
||||
font-family: SFMono-Regular, Consolas, Liberation Mono, Menlo, monospace;
|
||||
font-size: 85%;
|
||||
}
|
||||
|
||||
.markdown-content code,
|
||||
.markdown-body code {
|
||||
background-color: rgba(27, 31, 35, 0.05);
|
||||
border-radius: 3px;
|
||||
font-family: SFMono-Regular, Consolas, Liberation Mono, Menlo, monospace;
|
||||
font-size: 85%;
|
||||
margin: 0;
|
||||
padding: 0.2em 0.4em;
|
||||
}
|
||||
|
||||
/* Make sure all GitHub-style alert boxes look the same */
|
||||
.markdown-alert {
|
||||
padding: 8px 16px;
|
||||
margin-bottom: 16px;
|
||||
border-radius: 6px;
|
||||
}
|
||||
11
app/templates/components/markdown_content.html
Normal file
11
app/templates/components/markdown_content.html
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
{% macro render_markdown(content) %}
|
||||
<div class="markdown-content markdown-reading-view">
|
||||
{{ content|github_style_admonition|markdown|safe }}
|
||||
</div>
|
||||
{% endmacro %}
|
||||
|
||||
{% macro render_markdown_with_truncate(content, length=300) %}
|
||||
<div class="markdown-content markdown-reading-view">
|
||||
{{ content|github_style_admonition|markdown|truncate(length, true)|safe }}
|
||||
</div>
|
||||
{% endmacro %}
|
||||
|
|
@ -1,7 +1,12 @@
|
|||
{% extends "layout.html" %}
|
||||
{% from "components/markdown_content.html" import render_markdown %}
|
||||
|
||||
{% block title %}{{ title }}{% endblock %}
|
||||
|
||||
{% block styles %}
|
||||
<link href="{{ url_for('static', filename='css/github-markdown-reading-view.css') }}" rel="stylesheet">
|
||||
{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<div class="container-xl">
|
||||
<div class="page-header d-print-none">
|
||||
|
|
@ -111,27 +116,23 @@
|
|||
|
||||
<div class="col-md-8">
|
||||
<!-- Documentation section -->
|
||||
<div class="card h-100">
|
||||
<div class="card mt-3">
|
||||
<div class="card-header">
|
||||
<h3 class="card-title">Documentation</h3>
|
||||
{% if current_user.is_admin %}
|
||||
<div class="card-actions">
|
||||
<a href="{{ url_for('dashboard.edit_app_docs', app_id=app.id) }}" class="btn btn-primary btn-sm">
|
||||
<i class="ti ti-edit"></i> Edit Documentation
|
||||
</a>
|
||||
</div>
|
||||
{% endif %}
|
||||
</div>
|
||||
<div class="card-body markdown-content p-4">
|
||||
<div class="card-body p-0">
|
||||
{% if app.documentation %}
|
||||
{{ app.documentation|markdown|safe }}
|
||||
{{ render_markdown(app.documentation) }}
|
||||
{% else %}
|
||||
<div class="empty">
|
||||
<div class="empty-icon">
|
||||
<span class="ti ti-file-text"></span>
|
||||
</div>
|
||||
<p class="empty-title">No documentation available</p>
|
||||
<p class="empty-subtitle text-muted">
|
||||
Add documentation to this application to keep track of important information.
|
||||
</p>
|
||||
<div class="empty-action">
|
||||
<a href="{{ url_for('dashboard.app_edit', app_id=app.id) }}" class="btn btn-primary">
|
||||
<span class="ti ti-edit me-2"></span> Add Documentation
|
||||
</a>
|
||||
</div>
|
||||
<div class="p-3 text-muted">
|
||||
No documentation available for this application.
|
||||
</div>
|
||||
{% endif %}
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -1,3 +1,9 @@
|
|||
{% extends "dashboard/layout.html" %}
|
||||
{% from "components/markdown_content.html" import render_markdown, render_markdown_with_truncate %}
|
||||
|
||||
{% block title %}Subnet {{ subnet.cidr }}{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<!-- Add this in the action buttons section -->
|
||||
<div class="col-auto ms-auto">
|
||||
<div class="btn-list">
|
||||
|
|
@ -63,35 +69,36 @@
|
|||
});
|
||||
</script>
|
||||
|
||||
<!-- Find where application documentation is displayed -->
|
||||
<!-- Applications in Subnet section -->
|
||||
<div class="card mt-3">
|
||||
<div class="card-header">
|
||||
<h3 class="card-title">Applications in this Subnet</h3>
|
||||
</div>
|
||||
<div class="card-body p-0">
|
||||
{% if subnet.applications %}
|
||||
{% for app in subnet.applications %}
|
||||
<div class="app-card mb-3">
|
||||
<div class="app-card-header d-flex justify-content-between align-items-center p-3">
|
||||
<div class="app-card-header">
|
||||
<span class="app-link">
|
||||
<strong>{{ app.name }}</strong>
|
||||
{% if app.server %}
|
||||
<span class="text-muted fs-sm">on {{ app.server.hostname }} ({{ app.server.ip_address }})</span>
|
||||
<small class="text-muted">on {{ app.server.hostname }} ({{ app.server.ip_address }})</small>
|
||||
{% endif %}
|
||||
</span>
|
||||
<a href="{{ url_for('dashboard.app_view', app_id=app.id) }}" class="btn btn-sm btn-primary">View</a>
|
||||
</div>
|
||||
{% if app.documentation %}
|
||||
<div class="app-card-body p-3">
|
||||
<div class="markdown-content">
|
||||
{{ app.documentation|markdown|safe }}
|
||||
</div>
|
||||
|
||||
<div class="app-card-body">
|
||||
{% if app.documentation %}
|
||||
{{ render_markdown_with_truncate(app.documentation) }}
|
||||
<a href="{{ url_for('dashboard.app_view', app_id=app.id) }}" class="btn btn-sm btn-link">Read more</a>
|
||||
{% else %}
|
||||
<p class="text-muted">No documentation available for this application.</p>
|
||||
{% endif %}
|
||||
</div>
|
||||
{% else %}
|
||||
<div class="app-card-body p-3 text-muted">
|
||||
No documentation available for this application.
|
||||
</div>
|
||||
{% endif %}
|
||||
<div class="app-card-footer p-2">
|
||||
|
||||
{% if app.ports %}
|
||||
<div class="app-card-footer">
|
||||
<div class="d-flex justify-content-between align-items-center">
|
||||
<div class="usage-info">
|
||||
<small class="text-muted">Usage</small>
|
||||
|
|
@ -100,19 +107,18 @@
|
|||
</div>
|
||||
</div>
|
||||
<div class="port-info">
|
||||
{% if app.ports %}
|
||||
<small class="text-muted">{{ app.ports|length }} ports</small>
|
||||
{% else %}
|
||||
<small class="text-muted">No ports</small>
|
||||
{% endif %}
|
||||
<small class="text-muted">{{ app.ports|length }} port{% if app.ports|length != 1 %}s{% endif %}</small>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{% endif %}
|
||||
</div>
|
||||
{% endfor %}
|
||||
{% else %}
|
||||
<div class="p-3 text-muted">
|
||||
No applications found in this subnet.
|
||||
</div>
|
||||
{% endfor %}
|
||||
{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{% endblock %}
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
<html lang="en" data-bs-theme="{{ session.get('theme', 'dark') }}">
|
||||
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
|
|
@ -605,4 +605,4 @@
|
|||
{% block scripts %}{% endblock %}
|
||||
</body>
|
||||
|
||||
</html>
|
||||
</html>
|
||||
Loading…
Add table
Add a link
Reference in a new issue