Fix layout

Author: enaut

Cargo.lock

@@ -8,7 +8,7 @@ keywords = ["url", "link", "webpage", "actix", "web"]
 license = "MIT OR Apache-2.0"
 readme = "README.md"
 repository = "https://github.com/enaut/pslink/"
-version = "0.4.6"
+version = "0.4.7"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

app/Cargo.toml

@@ -837,15 +837,15 @@ fn view_link<F: Fn(&str) -> String>(
             Clicks::Extended(statistics) =>
                 if let Some(nodes) = l.cache.stats.clone() {
                     td![
+                        nodes,
                         span!(
                             C!("stats_total"),
                             t("total_clicks"),
                             match &l.data.clicks {
                                 Clicks::Count(c) => c.number,
                                 Clicks::Extended(e) => e.total.number,
                             }
-                        ),
-                        nodes
+                        )
                     ]
                 } else {
                     td!(statistics.total.number)
@@ -881,7 +881,7 @@ fn view_link<F: Fn(&str) -> String>(
 
 /// Render stats is best performed in the update rather than in the view cycle to avoid needless recalculations. Since the database only sends a list of weeks that contain clicks this function has to add the weeks that do not contain clicks. This is more easily said than done since the first and last week index are not constant, the ordering has to be right, and not every year has 52 weeks. But we ignore the last issue.
 fn render_stats(q: Statistics, maximum: &WeekCount) -> Node<Msg> {
-    let factor = 40.0 / f64::max(f64::from(maximum.total.number), 1.0);
+    let factor = 30.0 / f64::max(f64::from(maximum.total.number), 1.0);
     let mut full: Vec<WeekCount> = Vec::new();
     let mut week = chrono::Utc::now() - chrono::Duration::weeks(52);
 
@@ -922,7 +922,7 @@ fn render_stats(q: Statistics, maximum: &WeekCount) -> Node<Msg> {
     #[allow(clippy::cast_possible_truncation)]
     let normalized: Vec<i64> = full
         .iter()
-        .map(|v| (40.0 - f64::from(v.total.number) * factor).round() as i64)
+        .map(|v| (30.0 - f64::from(v.total.number) * factor).round() as i64)
         .collect();
     let mut points = Vec::new();
     points.push(format!("M 0 {}", &normalized[0]));

app/src/pages/list_links.rs

@@ -8,7 +8,7 @@ keywords = ["url", "link", "webpage", "actix", "web"]
 license = "MIT OR Apache-2.0"
 readme = "README.md"
 repository = "https://github.com/enaut/pslink/"
-version = "0.4.6"
+version = "0.4.7"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

locales/Cargo.toml

@@ -9,7 +9,7 @@ license = "MIT OR Apache-2.0"
 name = "pslink"
 readme = "README.md"
 repository = "https://github.com/enaut/pslink/"
-version = "0.4.6"
+version = "0.4.7"
 
 [build-dependencies]
 actix-web-static-files = { git = "https://github.com/enaut/actix-web-static-files.git", branch="master" }

pslink/Cargo.toml

@@ -1,4 +1,4 @@
-body {
+qbody {
     margin: 0;
     padding: 0;
 }
@@ -64,22 +64,17 @@ td {
     text-align: center;
     border: 1px solid #ccc;
     padding: 10px;
-    position: relative;
 }
 
 svg.statistics_graph {
     width: 120px;
-    height: 50px;
+    height: 30px;
 }
 
 .stats_total {
     display: block;
-    position: absolute;
     font-size: 0.7em;
-    background-color: rgba(255, 255, 255, 0.75);
-    padding: 3px;
-    border-radius: 14px;
-    bottom: 0;
+    margin-top: -4px;
 }
 
 td.table_qr svg {

pslink/static/admin.css

@@ -8,7 +8,7 @@ license = "MIT OR Apache-2.0"
 name = "pslink-shared"
 readme = "../pslink/README.md"
 repository = "https://github.com/enaut/pslink/"
-version = "0.4.6"
+version = "0.4.7"
 
 [dependencies]
 serde = {version="1.0", features = ["derive"]}