diff options
| -rw-r--r-- | include/network.php | 103 | ||||
| -rw-r--r-- | view/css/mod_connections.css | 34 | ||||
| -rw-r--r-- | view/css/mod_profiles.css | 144 | ||||
| -rw-r--r-- | view/css/mod_settings.css | 11 | ||||
| -rw-r--r-- | view/theme/redbasic/css/style.css | 261 |
5 files changed, 190 insertions, 363 deletions
diff --git a/include/network.php b/include/network.php index 77ba7b176..dac039230 100644 --- a/include/network.php +++ b/include/network.php @@ -576,63 +576,6 @@ function parse_xml_string($s,$strict = true) { return $x; } -function add_fcontact($arr,$update = false) { - - if($update) { - $r = q("UPDATE `fcontact` SET - `name` = '%s', - `photo` = '%s', - `request` = '%s', - `nick` = '%s', - `addr` = '%s', - `batch` = '%s', - `notify` = '%s', - `poll` = '%s', - `confirm` = '%s', - `alias` = '%s', - `pubkey` = '%s', - `updated` = '%s' - WHERE `url` = '%s' AND `network` = '%s' LIMIT 1", - dbesc($arr['name']), - dbesc($arr['photo']), - dbesc($arr['request']), - dbesc($arr['nick']), - dbesc($arr['addr']), - dbesc($arr['batch']), - dbesc($arr['notify']), - dbesc($arr['poll']), - dbesc($arr['confirm']), - dbesc($arr['alias']), - dbesc($arr['pubkey']), - dbesc(datetime_convert()), - dbesc($arr['url']), - dbesc($arr['network']) - ); - } - else { - $r = q("insert into fcontact ( `url`,`name`,`photo`,`request`,`nick`,`addr`, - `batch`, `notify`,`poll`,`confirm`,`network`,`alias`,`pubkey`,`updated` ) - values('%s','%s','%s','%s','%s','%s','%s','%s','%s','%s','%s','%s','%s','%s')", - dbesc($arr['url']), - dbesc($arr['name']), - dbesc($arr['photo']), - dbesc($arr['request']), - dbesc($arr['nick']), - dbesc($arr['addr']), - dbesc($arr['batch']), - dbesc($arr['notify']), - dbesc($arr['poll']), - dbesc($arr['confirm']), - dbesc($arr['network']), - dbesc($arr['alias']), - dbesc($arr['pubkey']), - dbesc(datetime_convert()) - ); - } - - return $r; -} - function scale_external_images($s, $include_link = true, $scale_replace = false) { @@ -710,52 +653,6 @@ function scale_external_images($s, $include_link = true, $scale_replace = false) return $s; } - -function fix_contact_ssl_policy(&$contact,$new_policy) { - - $ssl_changed = false; - if((intval($new_policy) == SSL_POLICY_SELFSIGN || $new_policy === 'self') && strstr($contact['url'],'https:')) { - $ssl_changed = true; - $contact['url'] = str_replace('https:','http:',$contact['url']); - $contact['request'] = str_replace('https:','http:',$contact['request']); - $contact['notify'] = str_replace('https:','http:',$contact['notify']); - $contact['poll'] = str_replace('https:','http:',$contact['poll']); - $contact['confirm'] = str_replace('https:','http:',$contact['confirm']); - $contact['poco'] = str_replace('https:','http:',$contact['poco']); - } - - if((intval($new_policy) == SSL_POLICY_FULL || $new_policy === 'full') && strstr($contact['url'],'http:')) { - $ssl_changed = true; - $contact['url'] = str_replace('http:','https:',$contact['url']); - $contact['request'] = str_replace('http:','https:',$contact['request']); - $contact['notify'] = str_replace('http:','https:',$contact['notify']); - $contact['poll'] = str_replace('http:','https:',$contact['poll']); - $contact['confirm'] = str_replace('http:','https:',$contact['confirm']); - $contact['poco'] = str_replace('http:','https:',$contact['poco']); - } - - if($ssl_changed) { - q("update contact set - url = '%s', - request = '%s', - notify = '%s', - poll = '%s', - confirm = '%s', - poco = '%s' - where id = %d limit 1", - dbesc($contact['url']), - dbesc($contact['request']), - dbesc($contact['notify']), - dbesc($contact['poll']), - dbesc($contact['confirm']), - dbesc($contact['poco']), - intval($contact['id']) - ); - } -} - - - /** * xml2array() will convert the given XML text to an array in the XML structure. * Link: http://www.bin-co.com/php/scripts/xml2array/ diff --git a/view/css/mod_connections.css b/view/css/mod_connections.css new file mode 100644 index 000000000..c2f6eeff0 --- /dev/null +++ b/view/css/mod_connections.css @@ -0,0 +1,34 @@ + +.field_abook_help { + color: #000; +} +.abook-them { + margin-left: 225px; + margin-bottom: 15px; +} +.abook-me { + margin-left: 36px; + margin-bottom: 15px; +} +.acheckbox { + margin-bottom: 5px !important; +} + +.abook-pending-contact { + background: orange; + font-weight: bold; + margin: 10px; + padding: 20px 5px 10px; +} + +#contact-slider { + width: 600px !important; +} + +.abook-edit-them, .abook-edit-me { + float: left; + width: 100px !important; +} +.field_abook_help { + float: left; +} diff --git a/view/css/mod_profiles.css b/view/css/mod_profiles.css new file mode 100644 index 000000000..8378245d2 --- /dev/null +++ b/view/css/mod_profiles.css @@ -0,0 +1,144 @@ +#profile-edit-default-desc { + color: #FF0000; + border: 1px solid #FF8888; + background-color: #FFEEEE; + padding: 7px; +} + +#profile-edit-clone-link-wrapper { + float: left; + margin-left: 50px; + margin-bottom: 20px; + width: 300px; +} + + +#profile-edit-links-end { + clear: both; + margin-bottom: 15px; +} + +.profile-listing-photo { + border: none; +} + +.profile-edit-submit-wrapper { + margin-top: 20px; + margin-bottom: 20px; +} + +#profile-photo-link-select-wrapper { + margin-top: 2em; +} + +#profile-photo-submit-wrapper { + margin-top: 10px; +} + +#profile-edit-with-label { + width: 175px; + margin-left: 20px; +} + +#profile-edit-profile-name-label, +#profile-edit-name-label, +#profile-edit-pdesc-label, +#profile-edit-gender-label, +#profile-edit-dob-label, +#profile-edit-address-label, +#profile-edit-locality-label, +#profile-edit-region-label, +#profile-edit-postal-code-label, +#profile-edit-country-name-label, +#profile-edit-marital-label, +#profile-edit-sexual-label, +#profile-edit-politic-label, +#profile-edit-religion-label, +#profile-edit-pubkeywords-label, +#profile-edit-prvkeywords-label, +#profile-edit-homepage-label, +#profile-edit-hometown-label { + float: left; + width: 175px; +} + +#profile-edit-profile-name, +#profile-edit-name, +#profile-edit-pdesc, +#gender-select, +#profile-edit-dob, +#profile-edit-address, +#profile-edit-locality, +#profile-edit-region, +#profile-edit-postal-code, +#profile-edit-country-name, +#marital-select, +#sexual-select, +#profile-edit-politic, +#profile-edit-religion, +#profile-edit-pubkeywords, +#profile-edit-prvkeywords, +#profile-in-dir-yes, +#profile-in-dir-no, +#profile-in-netdir-yes, +#profile-in-netdir-no, +#hide-wall-yes, +#hide-wall-no, +#hide-friends-yes, +#hide-friends-no { + float: left; + margin-bottom: 20px; +} + + +#profile-edit-pdesc-desc, +#profile-edit-pubkeywords-desc, +#profile-edit-prvkeywords-desc { + float: left; + margin-left: 20px; +} + + +#profile-edit-homepage, #profile-edit-hometown { + float: left; + margin-bottom: 35px; +} + +#profile-edit-profile-name-end, +#profile-edit-name-end, +#profile-edit-pdesc-end, +#profile-edit-gender-end, +#profile-edit-dob-end, +#profile-edit-address-end, +#profile-edit-locality-end, +#profile-edit-region-end, +#profile-edit-postal-code-end, +#profile-edit-country-name-end, +#profile-edit-marital-end, +#profile-edit-sexual-end, +#profile-edit-politic-end, +#profile-edit-religion-end, +#profile-edit-pubkeywords-end, +#profile-edit-prvkeywords-end, +#profile-edit-homepage-end, +#profile-edit-hometown-end, +#profile-in-dir-break, +#profile-in-dir-end, +#profile-in-netdir-break, +#profile-in-netdir-end, +#hide-wall-break, +#hide-wall-end, +#hide-friends-break, +#hide-friends-end { + clear: both; +} + + +#gender-select, #marital-select, #sexual-select { + width: 220px; +} + +#profile-edit-profile-name-wrapper .required { + color: #FF0000; + float: left; +} diff --git a/view/css/mod_settings.css b/view/css/mod_settings.css index 0532268f1..601cb2e0e 100644 --- a/view/css/mod_settings.css +++ b/view/css/mod_settings.css @@ -13,3 +13,14 @@ margin-top: 15px; margin-bottom: 45px; } + + + +#settings-notifications label { + margin-left: 20px; +} +#settings-notify-desc, #settings-activity-desc { + font-weight: bold; + margin-bottom: 15px; +} + diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index eaa3140c9..cd0842683 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -577,42 +577,7 @@ footer { #viewconnections { margin-top: 15px; } -#profile-edit-default-desc { - color: #FF0000; - border: 1px solid #FF8888; - background-color: #FFEEEE; - padding: 7px; -} - -#profile-edit-clone-link-wrapper { - float: left; - margin-left: 50px; - margin-bottom: 20px; - width: 300px; -} - -#profile-edit-links-end { - clear: both; - margin-bottom: 15px; -} - -.profile-listing-photo { - border: none; -} - -.profile-edit-submit-wrapper { - margin-top: 20px; - margin-bottom: 20px; -} - -#profile-photo-link-select-wrapper { - margin-top: 2em; -} - -#profile-photo-submit-wrapper { - margin-top: 10px; -} #profile-photo-wrapper img { width:175px; @@ -627,65 +592,6 @@ footer { } -#profile-edit-profile-name-label, -#profile-edit-name-label, -#profile-edit-pdesc-label, -#profile-edit-gender-label, -#profile-edit-dob-label, -#profile-edit-address-label, -#profile-edit-locality-label, -#profile-edit-region-label, -#profile-edit-postal-code-label, -#profile-edit-country-name-label, -#profile-edit-marital-label, -#profile-edit-sexual-label, -#profile-edit-politic-label, -#profile-edit-religion-label, -#profile-edit-pubkeywords-label, -#profile-edit-prvkeywords-label, -#profile-edit-homepage-label, -#profile-edit-hometown-label { - float: left; - width: 175px; -} - -#profile-edit-profile-name, -#profile-edit-name, -#profile-edit-pdesc, -#gender-select, -#profile-edit-dob, -#profile-edit-address, -#profile-edit-locality, -#profile-edit-region, -#profile-edit-postal-code, -#profile-edit-country-name, -#marital-select, -#sexual-select, -#profile-edit-politic, -#profile-edit-religion, -#profile-edit-pubkeywords, -#profile-edit-prvkeywords, -#profile-in-dir-yes, -#profile-in-dir-no, -#profile-in-netdir-yes, -#profile-in-netdir-no, -#hide-wall-yes, -#hide-wall-no, -#hide-friends-yes, -#hide-friends-no { - float: left; - margin-bottom: 20px; -} - - -#settings-notifications label { - margin-left: 20px; -} -#settings-notify-desc, #settings-activity-desc { - font-weight: bold; - margin-bottom: 15px; -} - #profile-in-dir-yes-label, #profile-in-dir-no-label, @@ -700,10 +606,6 @@ footer { width: 50px; } -#profile-edit-with-label { - width: 175px; - margin-left: 20px; -} #profile-publish-yes-reg, #profile-publish-no-reg { @@ -724,48 +626,6 @@ footer { } -#profile-edit-pdesc-desc, -#profile-edit-pubkeywords-desc, -#profile-edit-prvkeywords-desc { - float: left; - margin-left: 20px; -} - - -#profile-edit-homepage, #profile-edit-hometown { - float: left; - margin-bottom: 35px; -} - -#profile-edit-profile-name-end, -#profile-edit-name-end, -#profile-edit-pdesc-end, -#profile-edit-gender-end, -#profile-edit-dob-end, -#profile-edit-address-end, -#profile-edit-locality-end, -#profile-edit-region-end, -#profile-edit-postal-code-end, -#profile-edit-country-name-end, -#profile-edit-marital-end, -#profile-edit-sexual-end, -#profile-edit-politic-end, -#profile-edit-religion-end, -#profile-edit-pubkeywords-end, -#profile-edit-prvkeywords-end, -#profile-edit-homepage-end, -#profile-edit-hometown-end, -#profile-in-dir-break, -#profile-in-dir-end, -#profile-in-netdir-break, -#profile-in-netdir-end, -#hide-wall-break, -#hide-wall-end, -#hide-friends-break, -#hide-friends-end { - clear: both; -} - .settings-widget ul { list-style-type: none; padding: 0px; @@ -777,15 +637,6 @@ footer { } -#gender-select, #marital-select, #sexual-select { - width: 220px; -} - -#profile-edit-profile-name-wrapper .required { - color: #FF0000; - float: left; -} - #contacts-main { margin-top: 20px; margin-bottom: 20px; @@ -2566,40 +2417,6 @@ brain is weird like that */ } -.field_abook_help { - color: #000; -} -.abook-them { - margin-left: 225px; - margin-bottom: 15px; -} -.abook-me { - margin-left: 36px; - margin-bottom: 15px; -} -.acheckbox { - margin-bottom: 5px !important; -} - -.abook-pending-contact { - background: orange; - font-weight: bold; - margin: 10px; - padding: 20px 5px 10px; -} - -#contact-slider { - width: 600px !important; -} - -.abook-edit-them, .abook-edit-me { - float: left; - width: 100px !important; -} -.field_abook_help { - float: left; -} - .field .onoff { float: left; width: 80px; @@ -2748,8 +2565,6 @@ brain is weird like that */ .on { background-position: -144px -32px; } .off { background-position: 0px -48px; } -/*.starred { background-position: -16px -48px; } -.unstarred { background-position: -32px -48px; }*/ .tagged { background-position: -48px -48px; } .yellow { background-position: -64px -48px; } @@ -2757,12 +2572,8 @@ brain is weird like that */ color: gold; } -.filer-icon { - display: block; width: 16px; height: 16px; - background-image: url('../img/file.gif'); -} - .icon.dim { opacity: 0.3;filter:alpha(opacity=30); } + [class^="comment-edit-bb"] { list-style: none; display: none; @@ -2778,81 +2589,11 @@ brain is weird like that */ [class^="comment-edit-bb-end"] { clear: both; } -.editicon { - display: inline-block; - width: 16px; - height: 16px; - background-image: url(../img/bbedit.png); - background-color: #fff; - text-decoration: none; -} -.editicon:hover { - background-color: #ccc; -} -.boldbb { - background-position: 0px 0px; -} -.boldbb:hover { - background-position: 0px -16px; -} -.italicbb { - background-position: -16px 0px; -} -.italicbb:hover { - background-position: -16px -16px; -} -.underlinebb { - background-position: -32px 0px; -} -.underlinebb:hover { - background-position: -32px -16px; -} -.quotebb { - background-position: -48px 0px; -} -.quotebb:hover { - background-position: -48px -16px; -} -.codebb { - background-position: -64px 0px; -} -.codebb:hover { - background-position: -64px -16px; -} -.imagebb { - background-position: -80px 0px; -} -.imagebb:hover { - background-position: -80px -16px; -} -.urlbb { - background-position: -96px 0px; -} -.urlbb:hover { - background-position: -96px -16px; -} -.videobb { - background-position: -112px 0px; -} -.videobb:hover { - background-position: -112px -16px; -} - -.attachtype { - display: block; width: 20px; height: 23px; - float: left; - background-image: url('../../../../images/content-types.png'); -} .body-attach { margin-top: 10px; } -.type-video { background-position: 0px 0px; } -.type-image { background-position: -20px 0px; } -.type-audio { background-position: -40px 0px; } -.type-text { background-position: -60px 0px; } -.type-unkn { background-position: -80px 0px; } /* autocomplete popup */ |