merged multipart email changes

2 files changed, 332 insertions, 31 deletions

diff --git a/view/theme/duepuntozero/photo-menu.jpg b/view/theme/duepuntozero/photo-menu.jpg
new file mode 100644
index 000000000..fde5eb535
--- /dev/null
+++ b/view/theme/duepuntozero/photo-menu.jpg
diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index c54b9835a..8a397c10c 100644
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -16,7 +16,7 @@ body {
 }
 
 
-a, a:visited { color: #3465a4; text-decoration: none; }
+a, a:visited, a:link { color: #3465a4; text-decoration: none; }
 a:hover {text-decoration: underline; }
 
 input {
@@ -51,6 +51,11 @@ blockquote:before {
 	content: '>> ';
 }
 
+.icollapse-wrapper, .ccollapse-wrapper {
+	border: 1px solid #CCC;
+	padding: 5px;
+}
+
 #panel {
 	background-color: ivory;
 	position: absolute;
@@ -206,9 +211,12 @@ div.wall-item-content-wrapper.shiny {
 /* from default */
 #jot-perms-icon, 
 #profile-location,
-#profile-nolocation, 
+#profile-nolocation,
+#profile-youtube, 
 #profile-video, 
-#profile-link, 
+#profile-audio,
+#profile-link,
+#profile-title, 
 #wall-image-upload,
 #profile-upload-wrapper,
 #wall-image-upload-div,
@@ -216,7 +224,11 @@ div.wall-item-content-wrapper.shiny {
 	cursor: pointer;
 }
 
-.fakelink, .fakelink:visited {
+#jot-perms-icon {
+	float: left;
+}
+
+.fakelink, .fakelink:visited, .fakelink:link {
 	color: #3465a4;
 	text-decoration: none;
 	cursor: pointer;
@@ -370,6 +382,11 @@ input#dfrn-url {
 }
 
 #settings-nick-wrapper {
+	margin-top: 20px;
+
+}
+
+#settings-expire-end {
 	margin-bottom: 30px;
 }
 
@@ -378,6 +395,7 @@ input#dfrn-url {
 #settings-nick-end,
 #settings-defloc-end,
 #settings-allowloc-end,
+#settings-blockw-end,
 #settings-timezone-end,
 #settings-theme-end,
 #settings-password-end,
@@ -388,7 +406,14 @@ input#dfrn-url {
 #notify2-end,
 #notify3-end,
 #notify4-end,
-#notify5-end {
+#notify5-end,
+#imap-server-end,
+#imap-port-end,
+#imap-ssl-end,
+#imap-user-end,
+#imap-pass-end,
+#imap-replyto-end,
+#imap-pubmail-end {
 	margin-bottom: 5px;
 	clear: both;
 }
@@ -398,6 +423,7 @@ input#dfrn-url {
 #settings-nick-label,
 #settings-defloc-label,
 #settings-allowloc-label,
+#settings-blockw-label,
 #settings-timezone-label,
 #settings-theme-label,
 #settings-password-label,
@@ -408,7 +434,14 @@ input#dfrn-url {
 #settings-label-notify2,
 #settings-label-notify3,
 #settings-label-notify4,
-#settings-label-notify5 {
+#settings-label-notify5,
+#settings-label-imap1,
+#settings-label-imap2,
+#settings-label-imap3,
+#settings-label-imap4,
+#settings-label-imap5,
+#settings-label-imap6,
+#settings-label-imap7 {
 	float: left;
 	width: 200px;
 }
@@ -418,6 +451,7 @@ input#dfrn-url {
 #settings-nick,
 #settings-defloc,
 #settings-allowloc,
+#settings-blockw,
 #timezone-select,
 #theme-select,
 #settings-password,
@@ -427,7 +461,14 @@ input#dfrn-url {
 #notify2,
 #notify3,
 #notify4,
-#notify5 {
+#notify5,
+#imap-server,
+#imap-port,
+#imap-ssl,
+#imap-user,
+#imap-pass,
+#imap-replyto,
+#imap-pubmail {
 	float: left;
 	margin-bottom: 20px;
 }
@@ -465,10 +506,6 @@ input#dfrn-url {
 	width: 500px;
 }
 
-#settings-nick {
-	margin-bottom: 50px;
-}
-
 #cropimage-wrapper, #cropimage-preview-wrapper {
 	float: left;
 	padding: 30px;
@@ -605,6 +642,11 @@ input#dfrn-url {
 #profile-photo-link-select-wrapper {
 	margin-top: 2em;
 }
+
+#profile-photo-submit-wrapper {
+	margin-top: 10px;
+}
+
 #profile-photo-wrapper img {
 	width:175px;
 	height:175px;
@@ -624,7 +666,8 @@ input#dfrn-url {
 #profile-edit-sexual-label,
 #profile-edit-politic-label,
 #profile-edit-religion-label,
-#profile-edit-keywords-label,
+#profile-edit-pubkeywords-label,
+#profile-edit-prvkeywords-label,
 #profile-edit-homepage-label {
 	float: left;
 	width: 175px;
@@ -644,7 +687,8 @@ input#dfrn-url {
 #sexual-select,
 #profile-edit-politic,
 #profile-edit-religion,
-#profile-edit-keywords,
+#profile-edit-pubkeywords,
+#profile-edit-prvkeywords,
 #profile-in-dir-yes,
 #profile-in-dir-no,
 #profile-in-netdir-yes,
@@ -698,7 +742,8 @@ input#dfrn-url {
 
 
 #profile-edit-pdesc-desc,
-#profile-edit-keywords-desc {
+#profile-edit-pubkeywords-desc,
+#profile-edit-prvkeywords-desc {
 	float: left;
 	margin-left: 20px;
 }
@@ -741,7 +786,8 @@ input#dfrn-url {
 #profile-edit-sexual-end,
 #profile-edit-politic-end,
 #profile-edit-religion-end,
-#profile-edit-keywords-end,
+#profile-edit-pubkeywords-end,
+#profile-edit-prvkeywords-end,
 #profile-edit-homepage-end,
 #profile-in-dir-break,
 #profile-in-dir-end,
@@ -846,6 +892,37 @@ input#dfrn-url {
 	margin-bottom: 10px;
 	width: 100px;
 }
+.wall-item-photo-menu-button {
+	display: block;
+	position: absolute;
+	background-image: url("photo-menu.jpg");
+	background-position: top left; 
+	background-repeat: no-repeat;
+	margin: 0px; padding: 0px;
+	width: 16px;
+	height: 16px;
+	top: 74px; left:10px;
+	overflow: hidden;
+	text-indent: 40px;
+	display: none;
+	
+}
+.wall-item-photo-menu {
+	width: auto;
+	border: 2px solid #444444;
+	background: #FFFFFF;
+	position: absolute;
+	left: 10px; top: 90px;
+	display: none;
+	z-index: 10000;
+}
+.wall-item-photo-menu ul { margin:0px; padding: 0px; list-style: none }
+.wall-item-photo-menu li a { display: block; padding: 2px; }
+.wall-item-photo-menu li a:hover { color: #FFFFFF; background: #3465A4; text-decoration: none; }
+
+
+.comment .wall-item-photo-menu-button {	top: 44px;}
+.comment .wall-item-photo-menu { top: 60px; }
 
 .wallwall .wwto {
     left: 50px;
@@ -858,6 +935,7 @@ input#dfrn-url {
 	width: 30px;
 	height: 30px;
 }
+
 .wallwall .wall-item-photo-end {
 	clear: both;
 }
@@ -908,11 +986,23 @@ input#dfrn-url {
 	border-right: 2px solid #fff;
 }
 
+.wall-item-like-buttons > a,
+.wall-item-like-buttons > img {
+	float: left;
+}
 
 .wall-item-like-buttons img {
 	cursor: pointer;
 }
 
+.wall-item-share-buttons {
+	margin-left: 10px;
+}
+
+.editpost {
+	margin-left: 15px;
+}
+
 .wall-item-links-wrapper {
 	float: left;
 }
@@ -1029,33 +1119,45 @@ input#dfrn-url {
 }
 #profile-upload-wrapper {
 	float: left;
-	margin-left: 50px;
+	margin-left: 30px;
 }
 
 #profile-rotator {
 	float: left;
-	margin-left: 50px;
+	margin-left: 30px;
 }
 #profile-link-wrapper {
 	float: left;
-	margin-left: 20px;
+	margin-left: 15px;
 }
 #profile-youtube-wrapper {
 	float: left;
-	margin-left: 20px;
+	margin-left: 15px;
+}
+#profile-video-wrapper {
+	float: left;
+	margin-left: 15px;
+}
+#profile-audio-wrapper {
+	float: left;
+	margin-left: 15px;
 }
 #profile-location-wrapper {
 	float: left;
-	margin-left: 20px;
+	margin-left: 15px;
 }
 #profile-nolocation-wrapper {
 	float: left;
-	margin-left: 20px;
+	margin-left: 15px;
+}
+#profile-title-wrapper {
+	float: left;
+	margin-left: 15px;
 }
 
 #profile-jot-perms {
 	float: left;
-	margin-left: 200px;
+	margin-left: 100px;
 	font-weight: bold;
 	font-size: 1.2em;
 }
@@ -1343,6 +1445,9 @@ input#dfrn-url {
 #contact-edit-links {
 	float: left;
 }
+#contact-edit-links a {
+	float: left;
+}
 #contact-edit-links img {
 	margin-left: 20px;
 	border: none;
@@ -1405,7 +1510,7 @@ input#dfrn-url {
 	/*margin-left: 50px;*/
 }
 
-#block-message, #ignore-message, #profile-edit-insecure {
+#block-message, #ignore-message {
 	margin-top: 20px;
 	color: #FF0000;
 	font-size: 1.1em;
@@ -1414,13 +1519,21 @@ input#dfrn-url {
 	padding: 10px;
 }
 
+#profile-edit-insecure {
+	margin-top: 20px;
+	color: #FF0000;
+	font-size: 1.1em;
+	border: 1px solid #FF8888;
+	background-color: #FFEEEE;
+	padding-left: 5px;
+	/*: 3px 3px 3px 5px; */
+	width: 587px;
+}
+
 #block-message, #ignore-message {
 	width: 180px;
 }
 
-#profile-edit-insecure {
-	width: 600px;
-}
 
 /*
 .profile-tabs {
@@ -1471,11 +1584,26 @@ input#dfrn-url {
 	display: block;
 }
 
-#acl-permit-text,
+#acl-permit-text {
+	margin-top: 10px;
+	float: left;
+}
+
 #acl-deny-text {
 	margin-top: 10px;
 }
 
+#jot-public {
+	float: left;
+	margin-top: 10px;
+	margin-left: 15px;
+	color: #FF0000;
+}
+
+#acl-permit-text-end {
+	clear: both;
+}
+
 #acl-allow-group-label,
 #acl-allow-contact-label,
 #acl-deny-group-label,
@@ -1778,9 +1906,11 @@ a.mail-list-link {
 #profile-jot-desc {
 	/*float: left;*/
 	width: 480px;
+	color: #FF0000;
 	margin-top: 10px;
 	margin-bottom: 10px;
 }
+
 #character-counter {
 	float: right;
 	font-size: 120%;
@@ -1806,7 +1936,7 @@ a.mail-list-link {
 	margin-bottom: 15px;
 }
 
-#photos-upload-perms-menu, #photos-upload-perms-menu:visited {
+#photos-upload-perms-menu, #photos-upload-perms-menu:visited, #photos-upload-perms-menu:link {
 	color: #8888FF;
 	text-decoration: none;
 	cursor: pointer;
@@ -1939,6 +2069,12 @@ a.mail-list-link {
 	width: 52px;
 	height: 52px;
 }
+.contact-block-textdiv {
+	float: left;
+	width: 150px;
+	height: 34px;
+}
+
 #contact-block-end {
 	clear: both;
 }
@@ -2008,10 +2144,14 @@ a.mail-list-link {
 
 
 #plugin-settings-link, #account-settings-link {
-	margin-bottom: 25px;
+	margin-bottom: 10px;
+}
+
+#uexport-link {
+	margin-bottom: 20px;
 }
 
-/* end from defautlt */
+/* end from default */
 	
 
 .fn {
@@ -2056,7 +2196,7 @@ a.mail-list-link {
 
 .tool-wrapper {
   float: left;
-  margin-left: 20px;
+  margin-left: 15px;
 }
 
 .tool-link {
@@ -2107,3 +2247,164 @@ a.mail-list-link {
 	clear: both;
 }
 
+.profile-match-photo {
+	float: left;
+	text-align: center;
+	width: 120px;
+}
+
+.profile-match-name {
+	float: left;
+	text-align: center;
+	width: 120px;
+	overflow: hidden;
+}
+
+.profile-match-break,
+.profile-match-end {
+	clear: both;
+}
+
+.profile-match-wrapper {
+	float: left;
+	padding: 10px;
+}
+#profile-match-wrapper-end {
+	clear: both;
+}
+.side-link {
+	margin-bottom: 15px;
+}
+
+#language-selector {
+	position: absolute;
+	top: 0;
+	left: 0;
+}
+
+#group-members {
+	margin-top: 20px;
+	padding: 10px;
+	height: 250px;
+	overflow: auto;
+	border: 1px solid #ddd;
+}
+
+#group-members-end {
+	clear: both;
+}
+
+#group-separator {
+	margin-top: 10px;
+	margin-bottom: 10px;
+}
+
+#group-all-contacts {
+	padding: 10px;
+	height: 450px;
+	overflow: auto;
+	border: 1px solid #ddd;
+}
+
+#group-all-contacts-end {
+	clear: both;
+	margin-bottom: 10px;
+}
+
+#group-edit-desc {
+	margin-top: 15px;
+}
+
+
+#prof-members {
+	margin-top: 20px;
+	padding: 10px;
+	height: 250px;
+	overflow: auto;
+	border: 1px solid #ddd;
+}
+
+#prof-members-end {
+	clear: both;
+}
+
+#prof-separator {
+	margin-top: 10px;
+	margin-bottom: 10px;
+}
+
+#prof-all-contacts {
+	padding: 10px;
+	height: 450px;
+	overflow: auto;
+	border: 1px solid #ddd;
+}
+
+#prof-all-contacts-end {
+	clear: both;
+	margin-bottom: 10px;
+}
+
+#prof-edit-desc {
+	margin-top: 15px;
+}
+
+#crepair-nick-label,
+#crepair-url-label,
+#crepair-request-label,
+#crepair-confirm-label,
+#crepair-notify-label,
+#crepair-poll-label {
+	float: left;
+	width: 200px;
+	margin-bottom: 15px;
+}
+
+#crepair-nick,
+#crepair-url,
+#crepair-request,
+#crepair-confirm,
+#crepair-notify,
+#crepair-poll {
+	float: left;
+	width: 300px;
+}
+
+#contact-edit-links .icon, #contact-drop-links .icon {
+	margin: 0px 3px 0px 3px;
+}
+
+/**
+ * ICONS
+ */
+.icon {
+	display: block; width: 16px; height: 16px;
+	background-image: url('../../../images/icons.png');
+}
+.article { background-position: 0px 0px;}
+.audio { background-position: -16px 0px;}
+.block { background-position: -32px 0px;}
+.drop { background-position: -48px 0px;}
+.drophide { background-position: -64px 0px;}
+.edit { background-position: -80px 0px;}
+.camera { background-position: -96px 0px;}
+.dislike { background-position: -112px 0px;}
+.like { background-position: -128px 0px;}
+.link { background-position: -144px 0px;}
+
+.globe { background-position: 0px -16px;}
+.noglobe { background-position: -16px -16px;}
+.no { background-position: -32px -16px;}
+.pause { background-position: -48px -16px;}
+.play { background-position: -64px -16px;}
+.pencil { background-position: -80px -16px;}
+.small-pencil { background-position: -96px -16px;}
+.recycle { background-position: -112px -16px;}
+.remote-link { background-position: -128px -16px;}
+.share { background-position: -144px -16px;}
+
+.tools { background-position: 0px -32px;}
+.lock { background-position: -16px -32px;}
+.unlock { background-position: -32px -32px;}
+.video { background-position: -48px -32px;}
+.youtube { background-position: -64px -32px;}