deleted: view/theme/smoothly/categories_widget.tpl

	deleted:    view/theme/smoothly/contact_template.tpl
	deleted:    view/theme/smoothly/footer.tpl
	deleted:    view/theme/smoothly/generic_links_widget.tpl
	deleted:    view/theme/smoothly/group_drop.tpl
	deleted:    view/theme/smoothly/group_side.tpl
	deleted:    view/theme/smoothly/header.tpl
	deleted:    view/theme/smoothly/mail_head.tpl
	deleted:    view/theme/smoothly/message_side.tpl
	deleted:    view/theme/smoothly/peoplefind.tpl
	modified:   view/theme/smoothly/style.css

diff --git a/view/theme/smoothly/categories_widget.tpl b/view/theme/smoothly/categories_widget.tpl
deleted file mode 100644 (file)
index 773f3d7..0000000
--- a/view/theme/smoothly/categories_widget.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-<div id="categories-sidebar" class="widget">
-       <h3>$title</h3>
-       <div id="nets-desc">$desc</div>
-       
-       <ul class="categories-ul">
-               <li class="widget-list"><a href="$base" class="categories-link categories-all{{ if $sel_all }} categories-selected{{ endif }}">$all</a></li>
-               {{ for $terms as $term }}
-                       <li class="widget-list"><a href="$base?f=&category=$term.name" class="categories-link{{ if $term.selected }} categories-selected{{ endif }}">$term.name</a></li>
-               {{ endfor }}
-       </ul>
-       
-</div>

diff --git a/view/theme/smoothly/contact_template.tpl b/view/theme/smoothly/contact_template.tpl
deleted file mode 100644 (file)
index 917d302..0000000
--- a/view/theme/smoothly/contact_template.tpl
+++ /dev/null
@@ -1,24 +0,0 @@
-<div class="contact-entry-wrapper" id="contact-entry-wrapper-$contact.id" >
-       <div class="contact-entry-photo-wrapper" >
-               <div class="contact-entry-photo mframe" id="contact-entry-photo-$contact.id"
-               onmouseover="if (typeof t$contact.id != 'undefined') clearTimeout(t$contact.id); openMenu('contact-photo-menu-button-$contact.id')" 
-               onmouseout="t$contact.id=setTimeout('closeMenu(\'contact-photo-menu-button-$contact.id\'); closeMenu(\'contact-photo-menu-$contact.id\');',200)" >
-
-                       <a href="$contact.url" title="$contact.img_hover" /><img src="$contact.thumb" $contact.sparkle alt="$contact.name" /></a>
-
-                       {{ if $contact.photo_menu }}
-                       <span onclick="openClose('contact-photo-menu-$contact.id');" class="fakelink contact-photo-menu-button" id="contact-photo-menu-button-$contact.id">menu</span>
-                <div class="contact-photo-menu" id="contact-photo-menu-$contact.id">
-                    <ul>
-                        $contact.photo_menu
-                    </ul>
-                </div>
-                       {{ endif }}
-               </div>
-                       
-       </div>
-       <div class="contact-entry-photo-end" ></div>
-               <div class="contact-entry-name" id="contact-entry-name-$contact.id" >$contact.name</div>
-
-       <div class="contact-entry-end" ></div>
-</div>

diff --git a/view/theme/smoothly/footer.tpl b/view/theme/smoothly/footer.tpl
deleted file mode 100644 (file)
index 25058a7..0000000
--- a/view/theme/smoothly/footer.tpl
+++ /dev/null
@@ -1,3 +0,0 @@
-<div id="footerbox" style="display:none">
-<a style="float:right; color:#333;margin-right:10px;display: table;margin-top: 5px;" href="friendica" title="Site Info / Impressum" >Info / Impressum</a>
-</div>
\ No newline at end of file

diff --git a/view/theme/smoothly/generic_links_widget.tpl b/view/theme/smoothly/generic_links_widget.tpl
deleted file mode 100644 (file)
index a1159f5..0000000
--- a/view/theme/smoothly/generic_links_widget.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-<div class="widget{{ if $class }} $class{{ endif }}">
-       {{if $title}}<h3>$title</h3>{{endif}}
-       {{if $desc}}<div class="desc">$desc</div>{{endif}}
-       
-       <ul>
-               {{ for $items as $item }}
-                       <li class="widget-list"><a href="$item.url" class="{{ if $item.selected }}selected{{ endif }}">$item.label</a></li>
-               {{ endfor }}
-       </ul>
-       
-</div>

diff --git a/view/theme/smoothly/group_drop.tpl b/view/theme/smoothly/group_drop.tpl
deleted file mode 100644 (file)
index f088fc0..0000000
--- a/view/theme/smoothly/group_drop.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-<div class="group-delete-wrapper" id="group-delete-wrapper-$id" >
-       <a href="group/drop/$id" 
-               onclick="return confirmDelete();" 
-               title="$delete" 
-               id="group-delete-icon-$id" 
-               class="drophide group-delete-icon" onmouseover="imgbright(this);" onmouseout="imgdull(this);" >Delete Group</a>
-</div>
-<div class="group-delete-end"></div>

diff --git a/view/theme/smoothly/group_side.tpl b/view/theme/smoothly/group_side.tpl
deleted file mode 100644 (file)
index a1fc70a..0000000
--- a/view/theme/smoothly/group_side.tpl
+++ /dev/null
@@ -1,28 +0,0 @@
-<div class="widget" id="group-sidebar">
-<h3>$title</h3>
-
-<div id="sidebar-group-list">
-       <ul id="sidebar-group-ul">
-               {{ for $groups as $group }}
-                       <li class="sidebar-group-li">
-                               {{ if $group.cid }}
-                                       <input type="checkbox" 
-                                               class="{{ if $group.selected }}ticked{{ else }}unticked {{ endif }} action" 
-                                               onclick="contactgroupChangeMember('$group.id','$group.cid');return true;"
-                                               {{ if $group.ismember }}checked="checked"{{ endif }}
-                                       />
-                               {{ endif }}                     
-                               {{ if $group.edit }}
-                                       <a class="groupsideedit" href="$group.edit.href"><span class="icon small-pencil"></span></a>
-                               {{ endif }}
-                               <a class="sidebar-group-element {{ if $group.selected }}group-selected{{ endif }}" href="$group.href">$group.text</a>
-                       </li>
-               {{ endfor }}
-       </ul>
-       </div>
-  <div id="sidebar-new-group">
-  <a href="group/new">$createtext</a>
-  </div>
-</div>
-
-

diff --git a/view/theme/smoothly/header.tpl b/view/theme/smoothly/header.tpl
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/view/theme/smoothly/mail_head.tpl b/view/theme/smoothly/mail_head.tpl
deleted file mode 100644 (file)
index afb65f5..0000000
--- a/view/theme/smoothly/mail_head.tpl
+++ /dev/null
@@ -1,3 +0,0 @@
-<h3>$messages</h3>
-
-$tab_content

diff --git a/view/theme/smoothly/message_side.tpl b/view/theme/smoothly/message_side.tpl
deleted file mode 100644 (file)
index a35c74e..0000000
--- a/view/theme/smoothly/message_side.tpl
+++ /dev/null
@@ -1,13 +0,0 @@
-<div id="message-sidebar" class="widget">
-       <br />
-       <div id="side-invite-link" class="side-link" ><a href="$new.url" class="{{ if $new.sel }}newmessage-selected{{ endif }}">$new.label</a> </div>
-       
-       <ul class="message-ul">
-               {{ for $tabs as $t }}
-                       <li class="tool">
-                       <a href="$t.url" class="message-link{{ if $t.sel }}message-selected{{ endif }}">$t.label</a>
-                       </li>
-               {{ endfor }}
-       </ul>
-       
-</div>

diff --git a/view/theme/smoothly/peoplefind.tpl b/view/theme/smoothly/peoplefind.tpl
deleted file mode 100644 (file)
index 59f803d..0000000
--- a/view/theme/smoothly/peoplefind.tpl
+++ /dev/null
@@ -1,15 +0,0 @@
-<div id="peoplefind-sidebar" class="widget">
-       <h3>$findpeople</h3>
-       <div id="peoplefind-desc">$desc</div>
-       <form action="dirfind" method="post" >
-               <input id="side-peoplefind-url" type="text-sidebar" name="search" size="24" title="$hint" />
-               <input id="side-peoplefind-submit" type="submit" name="submit" value="$findthem" />
-       </form>
-       <div class="side-link" id="side-invite-link"><a href="match" >$similar</a></div>
-       <div class="side-link" id="side-invite-link"><a href="suggest" >$suggest</a></div>
-       <div class="side-link" id="side-invite-link"><a href="randprof" target="extlink" >$random</a></div>
-       {{ if $inv }} 
-       <div class="side-link" id="side-invite-link"><a href="invite" >$inv</a></div>
-       {{ endif }}
-</div>
-

diff --git a/view/theme/smoothly/style.css b/view/theme/smoothly/style.css
index 82a30b31317a020a64eb663e67c594a9c66564c2..79aba529e15210ba5502e61ab7a5c05f15cd0501 100644 (file)
--- a/view/theme/smoothly/style.css
+++ b/view/theme/smoothly/style.css
@@ -743,6 +743,29 @@ h3 #search:before {
        padding-bottom: 10px;
 }
 
+#message-sidebar {
+       vertical-align: middle;
+       margin-top: 40px;
+}
+
+#message-new {
+       padding: 7px;
+       width: 165px;
+       margin: 10px;
+       background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #bdbdbd), color-stop(1, #a2a2a2) );
+       background: -moz-linear-gradient( center top, #bdbdbd 5%, #a2a2a2 100% );
+       filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#bdbdbd', endColorstr='#a2a2a2');
+       background-color: #bdbdbd;
+       display: inline-block;
+       color: #efefef;
+       text-decoration: none;
+       text-align: center;
+       border: 1px solid #7C7D7B;
+       border-radius: 5px;
+               -moz-border-radius: 5px;
+               -webkit-border-radius: 5px;
+}
+
 #peoplefind-desc {
        margin-left: 10px;
 }
@@ -752,6 +775,10 @@ h3 #search:before {
        margin-right: 30px;
 }
 
+#sidebar-ungrouped {
+       margin: 10px;
+}
+
 #sidebar-group-list  a {
 }
 
@@ -766,6 +793,11 @@ h3 #search:before {
        margin: 10px;
 }
 
+#side-peoplefind-url {
+       margin: 10px;
+       width: 175px;
+}
+
 #sidebar-page-list {}
 
 .widget {
@@ -1334,10 +1366,6 @@ ul .sidebar-group-li .icon {
        margin-left: 10px;
 }
 
-.wall-item-photo-menu {
-       display: none;
-}
-
 .wall-item-photo-menu-button {
        display: none;
        text-indent: -99999px;
@@ -1564,6 +1592,7 @@ ul .sidebar-group-li .icon {
 }
 
 .wall-item-photo-menu {
+       display: none;
        min-width: 92px;
        color: #2e3436;
        border-top: 1px;
@@ -1572,7 +1601,7 @@ ul .sidebar-group-li .icon {
        border-left: 1px solid #dddddd;
        border-bottom: 1px solid #dddddd;
        position: absolute;
-       left: -2px; 
+       left: -1px; 
        top: 101px;
        display: none;
        z-index: 10000;
@@ -1917,7 +1946,7 @@ div[id$="wrapper"] br {
        padding:10px;
        width:120px;
        margin-bottom: 10px;
-       margin-left: 20px;
+       /*margin-left: 20px;*/
        background-color: #f6f6f6;
        border: 1px solid #dddddd;
        box-shadow: 3px 3px 4px #959494;
@@ -2260,9 +2289,9 @@ input #photo_edit_form {
 .mail-conv-detail, 
 .mail-list-detail {
        position: relative;
-       width: 500px;
+       width: 550px;
        padding: 50px;
-       margin: 20px auto;
+       margin: 20px 0 0 0;
        background-color: #fff;
        -webkit-box-shadow: 0 0 4px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1);
        -moz-box-shadow: 0 0 4px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1);
@@ -2733,50 +2762,10 @@ margin-left: 0px;
        text-align: center;
 }
 
+#side-invite-link,
+#side-random-profile-link,
+#side-suggest-link,
 #side-match-link {
-       width: 158px;
-       padding: 10px;
-       margin: auto 10px 20px;
-       background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #bdbdbd), color-stop(1, #a2a2a2) );
-       background: -moz-linear-gradient( center top, #bdbdbd 5%, #a2a2a2 100% );
-       filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#bdbdbd', endColorstr='#a2a2a2');
-       background-color: #bdbdbd;
-       padding: 5px 10px 5px 10px;
-       color: #efefef;
-       font-size: 1.1em;
-       text-align: center;
-       border: 1px solid #7C7D7B;
-       border-radius: 5px;
-               -moz-border-radius: 5px;
-               -webkit-border-radius: 5px;
-}
-
-#side-match-link:hover {
-       color: #efefef;
-       background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #1873a2), color-stop(1, #6da6c4) );
-       background: -moz-linear-gradient( center top, #1873a2 5%, #6da6c4 100% );
-       filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#1873a2', endColorstr='#6da6c4');
-       background-color: #1873a2;
-       border: 1px solid #7C7D7B;
-       box-shadow: 0 0 8px #BDBDBD;
-               -moz-box-shadow: 3px 3px 4px #959494;
-               -webkit-box-shadow: 3px 3px 4px #959494;
-       border-radius: 5px;
-               -moz-border-radius: 5px;
-               -webkit-border-radius: 5px;
-}
-
-#side-match-link:active {
-       background-color: #1873a2;
-       position: relative;
-       top: 1px;
-}
-
-#side-match-link a {
-       color: #efefef;
-}
-
-#side-invite-link {
        width: 80%;
        padding: 10px;
        margin: auto;
@@ -2795,7 +2784,10 @@ margin-left: 0px;
                -webkit-border-radius: 5px;
 }
 
-#side-invite-link:hover {
+#side-invite-link:hover,
+#side-random-profile-link:hover,
+#side-suggest-link:hover,
+#side-match-link:hover {
        color: #efefef;
        background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #1873a2), color-stop(1, #6da6c4) );
        background: -moz-linear-gradient( center top, #1873a2 5%, #6da6c4 100% );
@@ -2811,59 +2803,22 @@ margin-left: 0px;
 }
 
 
-#side-invite-link:active {
+#side-invite-link:active,
+#side-random-profile-link:active,
+#side-suggest-link:active,
+#side-match-link:active {
        background-color: #1873a2;
        position: relative;
        top: 1px;       
 }
 
-#side-invite-link a {
+#side-invite-link a,
+#side-random-profile-link a,
+#side-suggest-link a,
+#side-match-link a {
        color: #efefef; 
 }
 
-#side-suggest-link {
-       width: 80%;
-       padding: 10px;
-       margin: auto;
-       margin-bottom: 20px;
-       background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #bdbdbd), color-stop(1, #a2a2a2) );
-       background: -moz-linear-gradient( center top, #bdbdbd 5%, #a2a2a2 100% );
-       filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#bdbdbd', endColorstr='#a2a2a2');
-       background-color: #bdbdbd;
-       padding: 5px 10px 5px 10px;
-       color: #efefef;
-       font-size: 1.1em;
-       text-align: center;
-       border: 1px solid #7C7D7B;
-       border-radius: 5px;
-               -moz-border-radius: 5px;
-               -webkit-border-radius: 5px;
-}
-
-#side-suggest-link:hover {
-       color: #efefef;
-       background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #1873a2), color-stop(1, #6da6c4) );
-       background: -moz-linear-gradient( center top, #1873a2 5%, #6da6c4 100% );
-       filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#1873a2', endColorstr='#6da6c4');
-       background-color: #1873a2;      
-       border: 1px solid #7C7D7B;
-       box-shadow: 0 0 8px #BDBDBD;
-               -moz-box-shadow: 3px 3px 4px #959494;
-               -webkit-box-shadow: 3px 3px 4px #959494;
-       border-radius: 5px;
-               -moz-border-radius: 5px;
-               -webkit-border-radius: 5px;
-}
-
-#side-suggest-link:active {
-       background-color: #1873a2;
-       position: relative;
-       top: 1px;       
-}
-
-#side-suggest-link a {
-       color: #efefef; 
-}
 
 #invite-message,
 #invite-recipients, 
@@ -4326,7 +4281,6 @@ div #datebrowse-sidebar.widget {
        color: #1873a2;
        cursor: pointer;
        margin-bottom: 10px;
-       margin-left: 5px;
        /*background: url("down.png") no-repeat scroll left center transparent;*/
 }
 
@@ -4397,3 +4351,4 @@ div #datebrowse-sidebar.widget {
 .bigwidget {}
 
 #remote-friends-in-common  {}
+