Merge branch 'master' into tres

Conflicts:
	include/Contact.php
	include/ItemObject.php
	include/api.php
	include/attach.php
	include/diaspora.php
	include/dir_fns.php
	include/enotify.php
	include/event.php
	include/expire.php
	include/items.php
	include/notifier.php
	include/notify.php
	include/photos.php
	include/taxonomy.php
	include/text.php
	include/widgets.php
	include/zot.php
	mod/admin.php
	mod/channel.php
	mod/dirsearch.php
	mod/display.php
	mod/editwebpage.php
	mod/events.php
	mod/home.php
	mod/item.php
	mod/manage.php
	mod/mood.php
	mod/network.php
	mod/page.php
	mod/photos.php
	mod/ping.php
	mod/post.php
	mod/thing.php
	mod/viewsrc.php
	view/css/mod_events.css

17 files changed, 205 insertions, 131 deletions

diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css
index a645b13d2..ffc288962 100644
--- a/view/css/bootstrap-red.css
+++ b/view/css/bootstrap-red.css
@@ -4,13 +4,23 @@
 
 nav .badge {
 	position: relative;
-	top: -48px;
+	top: -49px;
 	float: left;
 	font-size: 10px;
-	padding: 2px 6px;
+	line-height: 20px;
+	padding: 0px 5px;
+	height: 20px;
+	min-width: 20px;
+	border-radius: 10px;
 	cursor: pointer;
 }
 
+@media screen and (max-width: 767px) {
+	nav .badge {
+		top: -46px;
+	}
+}
+
 nav i {
 	font-size: 14px;
 }
@@ -68,6 +78,10 @@ code {
 	white-space: normal;
 }
 
+.form-control {
+	font-size: unset;
+}
+
 /* Bootstrap assumes that checkboxes are on the left of labels, while it's usually the opposite in Red */
 .field.checkbox input[type="checkbox"] { margin-left: 0px; }
 .field.checkbox label { padding-left: 0px; font-weight: 700}
diff --git a/view/css/colorbox.css b/view/css/colorbox.css
new file mode 100644
index 000000000..a1acfc440
--- /dev/null
+++ b/view/css/colorbox.css
@@ -0,0 +1,45 @@
+#colorbox, #cboxOverlay, #cboxWrapper{position:absolute; top:0; left:0; z-index:1; overflow:hidden;}
+#cboxWrapper {max-width:none;}
+#cboxOverlay{position:fixed; width:100%; height:100%;}
+#cboxMiddleLeft, #cboxBottomLeft{clear:left;}
+#cboxContent{position:relative;}
+#cboxLoadedContent{overflow:auto; -webkit-overflow-scrolling: touch;}
+#cboxTitle{margin:0;}
+#cboxLoadingOverlay, #cboxLoadingGraphic{position:absolute; top:0; left:0; width:100%; height:100%;}
+#cboxPrevious, #cboxNext, #cboxClose, #cboxSlideshow{cursor:pointer;}
+.cboxPhoto{float:left; margin:auto; border:0; display:block; max-width:none; -ms-interpolation-mode:bicubic;}
+.cboxIframe{width:100%; height:100%; display:block; border:0; padding:0; margin:0;}
+#colorbox, #cboxContent, #cboxLoadedContent{box-sizing:content-box; -moz-box-sizing:content-box; -webkit-box-sizing:content-box;}
+
+/*
+    User Style:
+    Change the following styles to modify the appearance of Colorbox.  They are
+    ordered & tabbed in a way that represents the nesting of the generated HTML.
+*/
+#cboxOverlay{background:url(/images/overlay.png) repeat 0 0; opacity: 0.9; filter: alpha(opacity = 90);}
+#colorbox{outline:0;}
+   #cboxContent{background:#fff; overflow:hidden;}
+        .cboxIframe{background:#fff;}
+        #cboxError{padding:50px; border:1px solid #ccc;}
+        #cboxLoadedContent{margin-bottom:28px;}
+        #cboxTitle{position:absolute; bottom:4px; left:0; text-align:center; width:100%; color:#949494;}
+        #cboxCurrent{position:absolute; bottom:4px; left:58px; color:#949494;}
+        #cboxLoadingOverlay{background:url(/images/loading_background.png) no-repeat center center;}
+        #cboxLoadingGraphic{background:url(/images/loading.gif) no-repeat center center;}
+
+        /* these elements are buttons, and may need to have additional styles reset to avoid unwanted base styles */
+        #cboxPrevious, #cboxNext, #cboxSlideshow, #cboxClose {border:0; padding:0; margin:0; overflow:visible; width:auto; background:none; }
+
+        /* avoid outlines on :active (mouseclick), but preserve outlines on :focus (tabbed navigating) */
+        #cboxPrevious:active, #cboxNext:active, #cboxSlideshow:active, #cboxClose:active {outline:0;}
+
+        #cboxSlideshow{position:absolute; bottom:4px; right:30px; color:#0092ef;}
+        #cboxPrevious{position:absolute; bottom:0; left:0; background:url(/images/controls.png) no-repeat -75px 0; width:25px
+; height:25px; text-indent:-9999px;}
+        #cboxPrevious:hover{background-position:-75px -25px;}
+        #cboxNext{position:absolute; bottom:0; left:27px; background:url(/images/controls.png) no-repeat -50px 0; width:25px;
+ height:25px; text-indent:-9999px;}
+        #cboxNext:hover{background-position:-50px -25px;}
+        #cboxClose{position:absolute; bottom:0; right:0; background:url(/images/controls.png) no-repeat -25px 0; width:25px; 
+height:25px; text-indent:-9999px;}
+        #cboxClose:hover{background-position:-25px -25px;}
diff --git a/view/css/conversation.css b/view/css/conversation.css
index 8bc71bb6d..bb6887d59 100644
--- a/view/css/conversation.css
+++ b/view/css/conversation.css
@@ -11,22 +11,31 @@ code {
 .jothidden input {
 	border: 0px;
 	margin: 0px;
-	padding: 8px;
 	height: 39px;
-	width: 70%;
-	margin-bottom: 5px;
+	width: 100%;
 }
 
 .jothidden {
 	display:none;
 }
 
-#profile-jot-text {
+#jot-title-wrap input,
+#jot-pagetitle-wrap input {
+	padding: 8px;
+	margin-bottom: 5px;
+}
+
+.profile-jot-text {
 	height: 39px;
 	padding: 8px;
 	width: 100%;
 }
 
+.jot-attachment {
+	padding: 8px;
+	width: 100%;
+}
+
 #profile-jot-text-loading {
 	float: left;
 	padding: 30px 0px 0px 12px;
@@ -87,10 +96,6 @@ code {
 	margin-left:10px;
 }
 
-.lockview {
-	cursor: pointer;
-}
-
 .lockview-panel {
 	padding: 3px 20px;
 }
@@ -261,7 +266,12 @@ a.wall-item-name-link {
 	cursor: default;
 }
 
+.item-verified {
+	color: darkgreen;
+	font-size: 1em !important;
+}
+
 .item-forged {
 	color: #FF0000;
-	font-size: 1.5em !important;
+	font-size: 1em !important;
 }
diff --git a/view/css/full.css b/view/css/full.css
index 38864925f..05401f68c 100644
--- a/view/css/full.css
+++ b/view/css/full.css
@@ -6,12 +6,8 @@ header #banner {
 	margin-right: auto;
 }
 
-nav {
-	height: 24px;
-	display: block;
-}
-
 section {
 	display: block;
 	min-height: 112px;	
+	margin: 50px 10px;
 }
diff --git a/view/css/mod_admin.css b/view/css/mod_admin.css
index 6ceec3ac5..f052175bb 100644
--- a/view/css/mod_admin.css
+++ b/view/css/mod_admin.css
@@ -61,3 +61,7 @@
 #adminpage table tr:hover { background-color: #bbc7d7; }
 #adminpage .selectall { text-align: right; }
 
+
+.channels_ckbx, .pending_ckbx, .users_ckbx {
+	margin-top: -5px !important;
+}
diff --git a/view/css/mod_blocks.css b/view/css/mod_blocks.css
new file mode 100644
index 000000000..c930f5dc8
--- /dev/null
+++ b/view/css/mod_blocks.css
@@ -0,0 +1,32 @@
+#block-editor {
+	display: none;
+}
+
+#block-list-table {
+	width: 100%;
+}
+
+#block-list-table th:nth-child(1){
+	padding: 7px 3px 7px 10px;
+	white-space: nowrap;
+}
+
+#block-list-table td:nth-child(1){
+	padding: 7px 3px 7px 10px;
+}
+
+#block-list-table th:nth-child(5),
+#block-list-table td:nth-child(5){
+	padding: 7px 3px;
+	white-space: nowrap;
+}
+
+#block-list-table th:nth-child(6),
+#block-list-table td:nth-child(6){
+	padding: 7px 10px 7px 7px;
+	white-space: nowrap;
+}
+
+.webpage-list-tool {
+	padding: 7px 10px;
+}
diff --git a/view/css/mod_events.css b/view/css/mod_events.css
index 53432271b..a8e6415c7 100644
--- a/view/css/mod_events.css
+++ b/view/css/mod_events.css
@@ -8,23 +8,33 @@
     float: left;
 }
 
-#event-summary, #start_text, #finish_text {
-    width: 300px;
+#event-summary, #start_text {
+	width: 95%;
     float: left;
 }
 
+#finish_text {
+	width: 100%;
+    float: left;
+}
+
+
 #event-category-wrap {
 	margin-top: 15px;
 }
 
 .event-cats {
 	margin-top: 15px;
-    width: 400px;
+}
+
+.bootstrap-tagsinput {
+	width: 100%;
 }
 
 
 .required {
     float: left;
+	cursor: default;
 }
 
 #event-datetime-break {
@@ -39,3 +49,7 @@
 	margin-top: 15px;
 }
 
+#event-edit-preview-btn {
+	margin-right: 15px;
+}
+
diff --git a/view/css/mod_group.css b/view/css/mod_group.css
index 91d5b2136..b828e551d 100644
--- a/view/css/mod_group.css
+++ b/view/css/mod_group.css
@@ -2,7 +2,7 @@
 #group-new-submit-wrapper {
 	margin-top: 30px;
 }
-
+/*
 #group-edit-form > label {
 	float: left;
 	width: 300px;
@@ -16,7 +16,7 @@
 #group-edit-form .field {
 	clear: both;
 }
-
+*/
 #group-edit-submit-wrapper input {
 	clear: both;
 	width: 100px;
@@ -25,7 +25,7 @@
 #group-edit-select-end {
 	clear: both;
 }
-
+/*
 #group-edit-name-label {
 	float: left;
 	width: 175px;
@@ -44,7 +44,7 @@
 
 
 }
-
+*/
 
 #group_members_select_label {
 	display: block;
diff --git a/view/css/mod_layouts.css b/view/css/mod_layouts.css
new file mode 100644
index 000000000..7f65713e7
--- /dev/null
+++ b/view/css/mod_layouts.css
@@ -0,0 +1,3 @@
+#layout-editor {
+	display: none;
+}
diff --git a/view/css/mod_mail.css b/view/css/mod_mail.css
index 011c3edd5..11affffbd 100644
--- a/view/css/mod_mail.css
+++ b/view/css/mod_mail.css
@@ -45,8 +45,6 @@ img.mail-list-sender-photo {
 #prvmail-rotator-wrapper {
 	float: left;
 	margin-top: 10px;
-/*	margin-right: 10px;
-	width: 24px; */
 	cursor: pointer;
 }
 
@@ -79,16 +77,14 @@ img.mail-list-sender-photo {
 	float: right;
 	margin-right: 30px;
 	margin-top: 15px;
-}
-
-.mail-conv-delete-icon {
-	border: none;
+	margin-bottom: 5px;
 }
 
 .mail-conv-recall-wrapper {
 	float: right;
 	margin-right: 10px;
 	margin-top: 15px;
+	margin-bottom: 5px;
 }
 
 .mail-conv-outside-wrapper-end {
diff --git a/view/css/mod_menu.css b/view/css/mod_menu.css
index 6123ea56b..930bd834d 100644
--- a/view/css/mod_menu.css
+++ b/view/css/mod_menu.css
@@ -1,3 +1,11 @@
-#menulist > li {
-	margin-top: 15px;
-}
\ No newline at end of file
+#menu-list-table {
+	width: 100%;
+}
+
+#menu-list-table th:nth-child(2){
+	white-space: nowrap;
+}
+
+.menu-list-tool {
+	padding: 7px 10px;
+}
diff --git a/view/css/mod_mitem.css b/view/css/mod_mitem.css
index 3a33ae955..0718096e9 100644
--- a/view/css/mod_mitem.css
+++ b/view/css/mod_mitem.css
@@ -1,11 +1,13 @@
-.menu-item-list {
-	list-style-type: none;
+#mitem-list-table {
+	width: 100%;
 }
 
-.mitem-edit {
-	margin-right: 15px;
+#mitem-list-table th:nth-child(1),
+#mitem-list-table td:nth-child(1){
+	padding: 7px 3px 7px 10px;
+	white-space: nowrap;
 }
 
-.menu-item-list li {
-	margin-bottom: 15px;
-}
\ No newline at end of file
+.mitem-list-tool {
+	padding: 7px 10px;
+}
diff --git a/view/css/mod_photos.css b/view/css/mod_photos.css
index a2b3459cf..7718289c3 100644
--- a/view/css/mod_photos.css
+++ b/view/css/mod_photos.css
@@ -28,3 +28,9 @@
 	padding: 4px;
 	width: 100%;
 }
+
+#photo-map {
+	position: absolute;
+	left: -9999px;
+	top: -9999px;
+}
\ No newline at end of file
diff --git a/view/css/mod_settings.css b/view/css/mod_settings.css
index cd66684f8..7eff8e45b 100644
--- a/view/css/mod_settings.css
+++ b/view/css/mod_settings.css
@@ -1,66 +1,3 @@
-
-ul#settings-privacy-macros {
-	list-style-type: none;
-	margin: 0 0 10px 0;
-	padding: 0;
-}
-#settings-privacy-macros li {
-	margin-top: 5px;
-}
-
-#settings-permissions-wrapper {
-	margin-top: 15px;
-}
-
-#settings-default-perms {
-	margin-top: 15px;
-}
-
-#settings-perm-advanced {
-	margin-top: 15px;
-}
-
-.settings-common-perms {
-	margin-top: 15px;
-}
-
-#settings-permissions-wrapper .field {
-	margin-bottom: 10px;
-}
-
-#settings-permissions-wrapper .field > label {
-	width: 350px;
-}
-
-.settings-submit-wrapper {
-	margin-bottom: 10px;
-}
-
-#settings-remove-account-link {
-	margin-top: 15px;
-	margin-bottom: 45px;
-}
-
-#settings-notifications .field > label {
-	margin-left: 20px;
-	width: 330px;
-}
-#settings-notify-desc, #settings-activity-desc, #settings-vnotify-desc {
-	font-weight: bold;
-	margin-bottom: 15px;
-}
-
-#settings-menu-desc {
-	font-weight: bold;
-	float: left;
-	width: 350px;
-}
-
-#settings-channel-menu-div select {
-	float: left;
-}
-
-#settings-channel-menu-end {
-	clear: both;
-	margin-bottom: 15px;
+.group {
+	margin-left: 10px;
 }
diff --git a/view/css/mod_sharedwithme.css b/view/css/mod_sharedwithme.css
index 79fe0d7a9..8bf626deb 100644
--- a/view/css/mod_sharedwithme.css
+++ b/view/css/mod_sharedwithme.css
@@ -21,4 +21,3 @@
 .cloud-index-tool {
 	padding: 7px 10px;
 }
-
diff --git a/view/css/mod_webpages.css b/view/css/mod_webpages.css
index 1b5a798cd..d88657c69 100644
--- a/view/css/mod_webpages.css
+++ b/view/css/mod_webpages.css
@@ -1,6 +1,32 @@
-.webpage-list-table tr {
-	height: 20px;
+#webpage-editor {
+	display: none;
 }
-.webpage-list-table td {
-	padding: 5px;
+
+#webpage-list-table {
+	width: 100%;
+}
+
+#webpage-list-table th:nth-child(1){
+	padding: 7px 3px 7px 10px;
+	white-space: nowrap;
+}
+
+#webpage-list-table td:nth-child(1){
+	padding: 7px 3px 7px 10px;
+}
+
+#webpage-list-table th:nth-child(7),
+#webpage-list-table td:nth-child(7){
+	padding: 7px 3px;
+	white-space: nowrap;
+}
+
+#webpage-list-table th:nth-child(8),
+#webpage-list-table td:nth-child(8){
+	padding: 7px 10px 7px 7px;
+	white-space: nowrap;
+}
+
+.webpage-list-tool {
+	padding: 7px 10px;
 }
diff --git a/view/css/widgets.css b/view/css/widgets.css
index 43d132276..566dd2b8a 100644
--- a/view/css/widgets.css
+++ b/view/css/widgets.css
@@ -7,7 +7,6 @@
 	margin-top: 0px;
 }
 
-
 .widget .nav-pills > li > a {
 	padding: 6px 10px;
 }
@@ -50,8 +49,10 @@
 }
 
 
-/* fileas */
-
+/*  affinity slider */
+#main-slider {
+	margin: 10px 7px 45px 7px;
+}
 
 /* posted date */
 
@@ -83,21 +84,6 @@ a.group-edit-tool {
 li:hover .group-edit-icon {
 	opacity: 1;
 }
-/* affinity - slider */
-
-#main-slider {
-	position: relative; 
-	left: 5px; 
-	width: 90%;
-}
-
-.slider {
-	margin-top: 10px;
-	margin-bottom: 45px;
-}
-
-/* photo albums */
-
 
 /* Chatrooms */
 
@@ -112,10 +98,6 @@ li:hover .group-edit-icon {
 	margin-right: 5px;
 }
 
-.slider-container {
-	padding: 15px;
-}
-
 .rating-text-label {
 	margin-top: 30px;
 }