From b005423ebff9d862687207a5081af0a18b2c29f9 Mon Sep 17 00:00:00 2001
From: Michael Vogel <icarus@dabo.de>
Date: Thu, 24 Apr 2014 10:17:19 +0200
Subject: [PATCH] New layout for connector settings. New global CSS for things
 that seems to be identical in most themes.

---
 view/templates/head.tpl                |  1 +
 view/templates/settings_connectors.tpl |  4 +-
 view/theme/vier/style.css              | 61 ++------------------------
 3 files changed, 7 insertions(+), 59 deletions(-)

diff --git a/view/templates/head.tpl b/view/templates/head.tpl
index 1b01b71a0..6a1e71670 100644
--- a/view/templates/head.tpl
+++ b/view/templates/head.tpl
@@ -6,6 +6,7 @@
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
 <base href="{{$baseurl}}/" />
 <meta name="generator" content="{{$generator}}" />
+<link rel="stylesheet" href="{{$baseurl}}/view/global.css" type="text/css" media="all" />
 {{*<!--<link rel="stylesheet" href="{{$baseurl}}/library/fancybox/jquery.fancybox.css" type="text/css" media="screen" />-->*}}
 <link rel="stylesheet" href="{{$baseurl}}/library/colorbox/colorbox.css" type="text/css" media="screen" />
 <link rel="stylesheet" href="{{$baseurl}}/library/jgrowl/jquery.jgrowl.css" type="text/css" media="screen" />
diff --git a/view/templates/settings_connectors.tpl b/view/templates/settings_connectors.tpl
index a61ae4f58..ad462fb67 100644
--- a/view/templates/settings_connectors.tpl
+++ b/view/templates/settings_connectors.tpl
@@ -17,11 +17,11 @@
 
 {{else}}
 	<span id="settings_mail_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose('settings_mail_expanded'); openClose('settings_mail_inflated');">
-		<h3 class="settings-heading">{{$h_imap}}</h3>
+		<img class="connector" src="images/mail.png" /><h3 class="settings-heading connector">{{$h_imap}}</h3>
 	</span>
 	<div id="settings_mail_expanded" class="settings-block" style="display: none;">
 	<span class="fakelink" onclick="openClose('settings_mail_expanded'); openClose('settings_mail_inflated');">
-		<h3 class="settings-heading">{{$h_imap}}</h3>
+		<img class="connector" src="images/mail.png" /><h3 class="settings-heading connector">{{$h_imap}}</h3>
 	</span>
 	<p>{{$imap_desc}}</p>
 	{{include file="field_custom.tpl" field=$imap_lastcheck}}
diff --git a/view/theme/vier/style.css b/view/theme/vier/style.css
index ce1467844..2f05b07e0 100644
--- a/view/theme/vier/style.css
+++ b/view/theme/vier/style.css
@@ -1208,60 +1208,7 @@ section.minimal {
   width: 350px;
   float: left;
   font-size: 12px;
-}
-
-.type-link, .type-video {
-  border-top: 1px solid #D2D2D2;
-  border-bottom: 1px solid #D2D2D2;
-  display: block;
-  padding-top: 5px;
-  padding-bottom: 5px;
-  margin-top: 10px;
-/*
-padding-left: 170px;
-min-height: 90px;
-position: relative;
-*/
-}
-.type-link:after, .type-video:after {
-    content: ".";
-    display: block;
-    height: 0;
-    clear: both;
-    visibility: hidden;
-}
-.wall-item-container .wall-item-content .type-link img,
-.type-link img, .type-video img {
-  max-width: 160px;
-  max-height: 160px;
-  float: left;
-  margin-right: 10px;
-}
-.type-link blockquote, .type-video blockquote {
-  /* margin-left: 160px; */
-  margin-left: 0px;
-  max-height: 160px;
-  overflow: hidden;
-  border-left: 0px;
-  padding-left: 0px;
-  font-size: 13px;
-  line-height: normal;
-}
-.type-link .oembed, .type-video .oembed {
-  font-size: 18px;
-  font-weight: 300;
-  line-height: normal;
-}
-.type-link img, .type-video img {
-/* position: absolute;
-left: 0;
-top: 0; */
-}
-.type-link span.oembed + br, .type-video span.oembed + br,
-.type-link a + br, .type-video a + br,
-.type-link img + br, .type-video img + br{
-  display: none;
-}
+}}
 
 h2 {
   line-height: normal;
@@ -2429,9 +2376,9 @@ a.mail-list-link {
 }
 
 .settings-block {
-        border: 1px solid #AAA;
-        margin: 10px;
-        padding: 10px;
+        /* border: 1px solid #AAA; */
+        padding-left: 5px;
+        padding-right: 5px;
 }
 
 .app-title {