diff options
| -rwxr-xr-x | boot.php | 3 | ||||
| -rw-r--r-- | doc/Install.md | 111 | ||||
| -rw-r--r-- | doc/Intro-for-Developers.md | 105 | ||||
| -rw-r--r-- | doc/install.bb | 106 | ||||
| -rw-r--r-- | doc/intro_for_developers.bb | 27 | ||||
| -rw-r--r-- | doc/main.bb | 3 | ||||
| -rw-r--r-- | library/justifiedGallery/dist/js/jquery.justifiedGallery.js | 5 | ||||
| -rw-r--r-- | view/css/mod_photos.css | 49 | ||||
| -rw-r--r-- | view/theme/redbasic/css/style.css | 13 | ||||
| -rwxr-xr-x | view/tpl/conv_item.tpl | 2 |
10 files changed, 32 insertions, 392 deletions
@@ -73,7 +73,6 @@ $DIRECTORY_FALLBACK_SERVERS = array( 'https://zotid.net', 'https://redmatrix.nl', 'https://whogotzot.com', - 'https://red.mariovavti.com', 'https://red.zottel.red', 'https://red.pixelbits.de' ); @@ -2042,4 +2041,4 @@ function get_directory_realm() { if($x = get_config('system','directory_realm')) return $x; return DIRECTORY_REALM; -}
\ No newline at end of file +} diff --git a/doc/Install.md b/doc/Install.md deleted file mode 100644 index 1ff6e69e7..000000000 --- a/doc/Install.md +++ /dev/null @@ -1,111 +0,0 @@ - -Red Installation -=============== - -Red should run on commodity hosting platforms - such as those used to host Wordpress blogs and Drupal websites. But be aware that Red is more than a simple web application. The kind of functionality offered by Red requires a bit more of the host system than the typical blog. Not every PHP/MySQL hosting provider will be able to support Red. Many will. But **please** review the requirements and confirm these with your hosting provider prior to installation. - -Also if you encounter installation issues, please let us know via the Github issue tracker (https://github.com/friendica/red/issues). Please be as clear as you can about your operating environment and provide as much detail as possible about any error messages you may see, so that we can prevent it from happening in the future. Due to the large variety of operating systems and PHP platforms in existence we may have only limited ability to debug your PHP installation or acquire any missing modules - but we will do our best to solve any general code issues. - -Before you begin: Choose a domain name or subdomain name for your server. Put some thought into this - because changing it is currently not-supported. Things will break, and some of your friends may have difficulty communicating with you. We plan to address this limitation in a future release. - -Decide if you will use SSL and obtain an SSL certificate before software installation. You SHOULD use SSL. If you use SSL, you MUST use a "browser-valid" certificate. You MUST NOT use self-signed certificates! - -Please test your certificate prior to installation. A web tool for testing your certificate is available at "http://www.digicert.com/help/". When visiting your site for the first time, please use the SSL ("https://") URL if SSL is available. This will avoid problems later. The installation routine will not allow you to use a non browser-valid certificate. - -This restriction is incorporated because public posts from you may for example contain references to images on your own hub. If your certificate is not known by the internet browser of users they get a warning message complaining about some security issues. Although these complains are not the real truth - there are no security issues with your encryption! - the users may be confused, nerved or even worse may become scared about Red Matrix having security issues. Use one of the free certification instances! - -1. Requirements - - Apache with mod-rewrite enabled and "Options All" so you can use a -local .htaccess file - - - PHP 5.3 or later - - PHP *command line* access with register_argc_argv set to true in the -php.ini file - - curl, gd, mysql, and openssl extensions - - some form of email server or email gateway such that PHP mail() works - - mcrypt (optional; used for server-to-server message encryption) - - - Mysql 5.x - - - ability to schedule jobs with cron (Linux/Mac) or Scheduled Tasks -(Windows) [Note: other options are presented in Section 7 of this document] - - - Installation into a top-level domain or sub-domain (without a -directory/path component in the URL) is preferred. Directory paths will -not be as convenient to use and have not been thoroughly tested. - - - [Dreamhost.com offers all of the necessary hosting features at a -reasonable price. If your hosting provider doesn't allow Unix shell access, -you might have trouble getting everything to work.] - -2. Unpack the Red files into the root of your web server document area. - - - If you are able to do so, we recommend using git to clone the source repository rather than to use a packaged tar or zip file. This makes the software much easier to update. The Linux command to clone the repository into a directory "mywebsite" would be - - `git clone https://github.com/friendica/red.git mywebsite` - - - and then you can pick up the latest changes at any time with - - `git pull` - - - make sure folder *store/[data]/smarty3* exists and is writable by webserver - - `mkdir -p "store/\[data\]/smarty3"` - - `chmod 777 "store/\[data\]/smarty3"` - - - For installing addons - - - First you should be **on** your website folder - - `cd mywebsite` - - - Then you should clone the addon repository (separtely) - - `git clone https://github.com/friendica/red-addons.git addon` - - - For keeping the addon tree updated, you should be on you addon tree and issue a git pull - - `cd mywebsite/addon` - - `git pull` - - - If you copy the directory tree to your webserver, make sure - that you also copy .htaccess - as "dot" files are often hidden - and aren't normally copied. - - -3. Create an empty database and note the access details (hostname, username, password, database name). - -4. Visit your website with a web browser and follow the instructions. Please note any error messages and correct these before continuing. - -5. *If* the automated installation fails for any reason, check the following: - - - ".htconfig.php" exists ... If not, edit htconfig.php and change system settings. Rename -to .htconfig.php - - Database is populated. ... If not, import the contents of "database.sql" with phpmyadmin -or mysql command line - -6. At this point visit your website again, and register your personal account. -Registration errors should all be recoverable automatically. -If you get any *critical* failure at this point, it generally indicates the -database was not installed correctly. You might wish to move/rename -.htconfig.php to another name and empty (called 'dropping') the database -tables, so that you can start fresh. - -7. Set up a cron job or scheduled task to run the poller once every 15 -minutes in order to perform background processing. Example: - - `cd /base/directory; /path/to/php include/poller.php` - -Change "/base/directory", and "/path/to/php" as appropriate for your situation. - -If you are using a Linux server, run "crontab -e" and add a line like the -one shown, substituting for your unique paths and settings: - -`*/15 * * * * cd /home/myname/mywebsite; /usr/bin/php include/poller.php` - -You can generally find the location of PHP by executing "which php". If you -have troubles with this section please contact your hosting provider for -assistance. Red will not work correctly if you cannot perform this step. diff --git a/doc/Intro-for-Developers.md b/doc/Intro-for-Developers.md deleted file mode 100644 index bf74cb7c1..000000000 --- a/doc/Intro-for-Developers.md +++ /dev/null @@ -1,105 +0,0 @@ -File system layout: -=================== - -[addon] optional addons/plugins - -[boot.php] Every process uses this to bootstrap the application structure - -[doc] Help Files - -[images] core required images - -[include] The "model" in MVC - (back-end functions), also contains PHP "executables" for background processing - -[index.php] The front-end controller for web access - -[install] Installation and upgrade files and DB schema - -[js] core required javascript - -[library] Third party modules (must be license compatible) - -[mod] Controller modules based on URL pathname (e.g. http://sitename/foo loads mod/foo.php) - -[spec] protocol specifications - -[util] translation tools, main English string database and other miscellaneous utilities - -[version.inc] contains current version (auto-updated via cron for the master repository and distributed via git) - -[view] theming and language files - - -[view/(css,js,img,php,tpl)] default theme files - -[view/(en,it,es ...)] language strings and resources - -[view/theme/] individual named themes containing (css,js,img,php,tpl) over-rides - - -The Database: -============= - -* abook - contact table, replaces Friendica 'contact' -* account - service provider account -* addon - registered plugins -* attach - file attachments -* auth_codes - OAuth usage -* cache - TBD -* challenge - old DFRN structure, may re-use or may deprecate -* channel - replaces Friendica 'user' -* clients - OAuth usage -* config - main configuration storage -* event - Events -* fcontact - friend suggestion stuff -* ffinder - friend suggestion stuff -* fserver - obsolete -* fsuggest - friend suggestion stuff -* gcign - ignored friend suggestions -* gcontact - social graph storage, obsolete -* glink - social graph storage - obsolete -* group - privacy groups -* group_member - privacy groups -* hook - plugin hook registry -* hubloc - Red location storage, ties a location to an xchan -* intro - DFRN introductions, may be obsolete -* item - posts -* item_id - other identifiers on other services for posts -* mail - private messages -* manage - may be unused in Red, table of accounts that can "su" each other -* notify - notifications -* notify-threads - need to factor this out and use item thread info on notifications -* outq - Red output queue -* pconfig - personal (per channel) configuration storage -* photo - photo storage -* profile - channel profiles -* profile_check - DFRN remote auth use, may be obsolete -* queue - old Friendica queue, obsolete -* register - registrations requiring admin approval -* session - web session storage -* site - site table to find directory peers -* spam - unfinished -* term - item taxonomy (categories, tags, etc.) table -* tokens - OAuth usage -* verify - general purpose verification structure -* xchan - replaces 'gcontact', list of known channels in the universe -* xlink - "friends of friends" linkages derived from poco -* xprof - if this hub is a directory server, contains basic public profile info of everybody in the network -* xtag - if this hub is a directory server, contains tags or interests of everybody in the network - - -How to theme Red - by Olivier Migeot -==================================== - -This is a short documentation on what I found while trying to modify Red's appearance. - -First, you'll need to create a new theme. This is in /view/theme, and I chose to copy 'redbasic' since it's the only available for now. Let's assume I named it <theme>. - -Oh, and don't forget to rename the _init function in <theme>/php/theme.php to be <theme>_init() instead of redbasic_init(). - -At that point, if you need to add javascript or css files, add them to <theme>/js or <theme>/css, and then "register" them in <theme>_init() through head_add_js('file.js') and head_add_css('file.css'). - -Now you'll probably want to alter a template. These can be found in in /view/tpl OR view/<theme>/tpl. All you should have to do is copy whatever you want to tweak from the first place to your theme's own tpl directory. - - - diff --git a/doc/install.bb b/doc/install.bb index 16e3730ee..1a35537aa 100644 --- a/doc/install.bb +++ b/doc/install.bb @@ -1,105 +1 @@ -[b]Red Installation[/b]
-
-Red should run on commodity hosting platforms - such as those used to host Wordpress blogs and Drupal websites. But be aware that Red is more than a simple web application. The kind of functionality offered by Red requires a bit more of the host system than the typical blog. Not every PHP/MySQL hosting provider will be able to support Red. Many will. But **please** review the requirements and confirm these with your hosting provider prior to installation.
-
-Also if you encounter installation issues, please let us know via the Github issue tracker (#^[url=https://github.com/friendica/red/issues]https://github.com/friendica/red/issues[/url]). Please be as clear as you can about your operating environment and provide as much detail as possible about any error messages you may see, so that we can prevent it from happening in the future. Due to the large variety of operating systems and PHP platforms in existence we may have only limited ability to debug your PHP installation or acquire any missing modules - but we will do our best to solve any general code issues.
-
-Before you begin: Choose a domain name or subdomain name for your server.
-
-1. Requirements
- - Apache with mod-rewrite enabled and "AllowOverride All" so you can use a
-local .htaccess file
-
- - PHP 5.3 or later
- - PHP *command line* access with register_argc_argv set to true in the
-php.ini file
- - curl, gd, mysql, and openssl extensions
- - some form of email server or email gateway such that PHP mail() works
- - mcrypt
-
- - Mysql 5.x
-
- - ability to schedule jobs with cron (Linux/Mac) or Scheduled Tasks
-(Windows) [Note: other options are presented in Section 7 of this document]
-
- - Installation into a top-level domain or sub-domain (without a
-directory/path component in the URL) is preferred. Directory paths will
-not be as convenient to use and have not been thoroughly tested.
-
-
- [Dreamhost.com offers all of the necessary hosting features at a
-reasonable price. If your hosting provider doesn't allow Unix shell access,
-you might have trouble getting everything to work.]
-
-2. Unpack the Red files into the root of your web server document area.
-
- - If you are able to do so, we recommend using git to clone the source repository rather than to use a packaged tar or zip file. This makes the software much easier to update. The Linux command to clone the repository into a directory "mywebsite" would be
-
- `git clone #^[url=https://github.com/friendica/red.git]https://github.com/friendica/red.git[/url] mywebsite`
-
- - and then you can pick up the latest changes at any time with
-
- `git pull`
-
- - make sure folder *store/[data]/smarty3* exists and is writable by webserver
-
- `mkdir -p "store/\[data\]/smarty3"`
-
- `chmod 777 "store/\[data\]/smarty3"`
-
- - For installing addons
-
- - First you should be **on** your website folder
-
- `cd mywebsite`
-
- - Then you should clone the addon repository (separtely)
-
- `git clone #^[url=https://github.com/friendica/red-addons.git]https://github.com/friendica/red-addons.git[/url] addon`
-
- - For keeping the addon tree updated, you should be on you addon tree and issue a git pull
-
- `cd mywebsite/addon`
-
- `git pull`
-
- - If you copy the directory tree to your webserver, make sure
- that you also copy .htaccess - as "dot" files are often hidden
- and aren't normally copied.
-
-
-3. Create an empty database and note the access details (hostname, username, password, database name).
-
-4. Visit your website with a web browser and follow the instructions. Please note any error messages and correct these before continuing.
-
-5. *If* the automated installation fails for any reason, check the following:
-
- - ".htconfig.php" exists ... If not, edit htconfig.php and change system settings. Rename
-to .htconfig.php
- - Database is populated. ... If not, import the contents of "database.sql" with phpmyadmin
-or mysql command line
-
-6. At this point visit your website again, and register your personal account.
-Registration errors should all be recoverable automatically.
-If you get any *critical* failure at this point, it generally indicates the
-database was not installed correctly. You might wish to move/rename
-.htconfig.php to another name and empty (called 'dropping') the database
-tables, so that you can start fresh.
-
-7. Set up a cron job or scheduled task to run the poller once every 15
-minutes in order to perform background processing. Example:
-
- `cd /base/directory; /path/to/php include/poller.php`
-
-Change "/base/directory", and "/path/to/php" as appropriate for your situation.
-
-If you are using a Linux server, run "crontab -e" and add a line like the
-one shown, substituting for your unique paths and settings:
-
-`*/15 * * * * cd /home/myname/mywebsite; /usr/bin/php include/poller.php`
-
-You can generally find the location of PHP by executing "which php". If you
-have troubles with this section please contact your hosting provider for
-assistance. Red will not work correctly if you cannot perform this step.
-
-Return to the [url=[baseurl]/help/main]Main documentation page[/url]
+#include install/INSTALL.txt;
diff --git a/doc/intro_for_developers.bb b/doc/intro_for_developers.bb index 086d3c681..2f498e6fb 100644 --- a/doc/intro_for_developers.bb +++ b/doc/intro_for_developers.bb @@ -41,46 +41,63 @@ [li]abook - contact table, replaces Friendica 'contact'[/li]
[li]account - service provider account[/li]
[li]addon - registered plugins[/li]
+ [li]app - peronal app data[/li]
[li]attach - file attachments[/li]
[li]auth_codes - OAuth usage[/li]
[li]cache - TBD[/li]
[li]challenge - old DFRN structure, may re-use or may deprecate[/li]
[li]channel - replaces Friendica 'user'[/li]
+ [li]chat - chat room content[/li]
+ [li]chatpresence - channel presence information for chat[/li]
+ [li]chatroom - data for the actual chat room[/li]
[li]clients - OAuth usage[/li]
[li]config - main configuration storage[/li]
+ [li]conv - [/li]
[li]event - Events[/li]
[li]fcontact - friend suggestion stuff[/li]
[li]ffinder - friend suggestion stuff[/li]
[li]fserver - obsolete[/li]
[li]fsuggest - friend suggestion stuff[/li]
- [li]gcign - ignored friend suggestions[/li]
- [li]gcontact - social graph storage, obsolete[/li]
- [li]glink - social graph storage - obsolete[/li]
- [li]group - privacy groups[/li]
+ [li]groups - privacy groups[/li]
[li]group_member - privacy groups[/li]
[li]hook - plugin hook registry[/li]
[li]hubloc - Red location storage, ties a location to an xchan[/li]
[li]intro - DFRN introductions, may be obsolete[/li]
[li]item - posts[/li]
[li]item_id - other identifiers on other services for posts[/li]
+ [li]likes - likes of 'things'[/li]
[li]mail - private messages[/li]
[li]manage - may be unused in Red, table of accounts that can "su" each other[/li]
+ [li]menu - channel menu data[/li]
+ [li]menu_item - items uses by channel menus[/li]
[li]notify - notifications[/li]
[li]notify-threads - need to factor this out and use item thread info on notifications[/li]
+ [li]obj - object data for things (x has y)[/li]
[li]outq - Red output queue[/li]
[li]pconfig - personal (per channel) configuration storage[/li]
[li]photo - photo storage[/li]
+ [li]poll - data for polls[/li]
+ [li]poll_elm - data for poll elements[/li]
+ [li]profdef - custom profile field definitions[/li]
+ [li]profext - custom profile field data[/li]
[li]profile - channel profiles[/li]
[li]profile_check - DFRN remote auth use, may be obsolete[/li]
- [li]queue - old Friendica queue, obsolete[/li]
[li]register - registrations requiring admin approval[/li]
[li]session - web session storage[/li]
+ [li]shares - shared item information[/li]
+ [li[sign - Diaspora signatures. To be phased out.[/li]
[li]site - site table to find directory peers[/li]
+ [li]source - channel sources data[/li]
[li]spam - unfinished[/li]
+ [li]sys_perms - extensible permissions for the sys channel[/li]
[li]term - item taxonomy (categories, tags, etc.) table[/li]
[li]tokens - OAuth usage[/li]
+ [li]updates - directory sync updates[/li]
[li]verify - general purpose verification structure[/li]
+ [li]vote - vote data for polls[/li]
[li]xchan - replaces 'gcontact', list of known channels in the universe[/li]
+ [li]xchat - bookmarked chat rooms[/li]
+ [li]xconfig - as pconfig but for channels with no local account[/li]
[li]xlink - "friends of friends" linkages derived from poco[/li]
[li]xprof - if this hub is a directory server, contains basic public profile info of everybody in the network[/li]
[li]xtag - if this hub is a directory server, contains tags or interests of everybody in the network[/li]
diff --git a/doc/main.bb b/doc/main.bb index 137ea93a8..e0cca3d31 100644 --- a/doc/main.bb +++ b/doc/main.bb @@ -49,6 +49,9 @@ Zot is the great new communicaton protocol invented especially for the Red Matri [zrl=[baseurl]/help/faq_admins]FAQ For Admins[/zrl]
[size=large][b]Technical Documentation[/b][/size]
+[zrl=[baseurl]/help/Zot---A-High-Level-Overview.md[/zrl]A high level overview of Zot[/zrl]
+[zrl=[baseurl]/help/zot]An introduction to Zot/zrl]
+[zrl=[baseurl]/help/zot_structures]Zot Stuctures[/zrl]
[zrl=[baseurl]/help/comanche]Comanche Page Descriptions[/zrl]
[zrl=[baseurl]/help/Creating-Templates]Creating Comanche Templates[/zrl]
[zrl=[baseurl]/help/Widgets]Core Widgets[/zrl]
diff --git a/library/justifiedGallery/dist/js/jquery.justifiedGallery.js b/library/justifiedGallery/dist/js/jquery.justifiedGallery.js index 2c3eee11b..9b5c66081 100644 --- a/library/justifiedGallery/dist/js/jquery.justifiedGallery.js +++ b/library/justifiedGallery/dist/js/jquery.justifiedGallery.js @@ -444,6 +444,7 @@ } return this.each(function (index, gallery) { + var $gallery = $(gallery); $gallery.addClass('justified-gallery'); @@ -492,14 +493,13 @@ } else if (arg === 'norewind') { // In this case we don't rewind, and analyze all the images } else { - //redmatrix - this makes the gallery jump back to top after new content is loaded context.settings = $.extend({}, context.settings, arg); rewind(context); } checkSettings(context); - context.entries = $gallery.find('> a').toArray(); + context.entries = $gallery.find('> a, > div').toArray(); if (context.entries.length === 0) return; // Randomize @@ -533,6 +533,7 @@ //DEBUG// console.log('listed ' + $image.attr('alt')); imagesToLoad = true; + // Spinner start if (context.spinner.active === false) { context.spinner.active = true; diff --git a/view/css/mod_photos.css b/view/css/mod_photos.css index b81145cd5..0c4c25bae 100644 --- a/view/css/mod_photos.css +++ b/view/css/mod_photos.css @@ -1,11 +1,3 @@ - - -.photo-top-photo, .photo-album-photo { - padding: 10px; - max-width: 300px; -} - - .photos-end { clear: both; margin-bottom: 25px; @@ -30,51 +22,11 @@ clear: both; } -.photo-album-image-wrapper { - float: left; - margin-top: 15px; - margin-right: 15px; - margin-left: 15px; -} -.photo-album-image-wrapper .caption { - display: none; - width: 100%; - bottom: 0px; - padding: 0.5em 0.5em 0px 0.5em; - margin: 0px; -} -.photo-album-image-wrapper a:hover .caption { - display:block; -} - #photo-album-end { clear: both; margin-bottom: 25px; } -.photo-top-image-wrapper { - float: left; - margin-top: 15px; - margin-right: 15px; - margin-left: 15px; - margin-bottom: 15px; -} -.photo-top-album-name { - width: 100%; - min-height: 2em; - bottom: 0px; - padding: 0px 3px; - padding-top: 0.5em; -} -#photo-top-end { - clear: both; -} - -#photo-top-links { - margin-bottom: 30px; - margin-left: 30px; -} - #photos-upload-newalbum-div { float: left; width: 175px; @@ -83,6 +35,7 @@ #photos-upload-noshare { margin-bottom: 10px; } + #photos-upload-existing-album-text { float: left; width: 175px; diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index df95e48b8..bb11ddbb9 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -675,10 +675,6 @@ aside li { margin: auto; } -.photo-top-image-wrapper, .photo-album-image-wrapper { - width: 240px; -} - .photo-top-photo-link, .photo-album-photo-link { display: block; width: 100%; @@ -688,15 +684,6 @@ aside li { overflow: hidden; } -.photo-album-image-wrapper .caption { - background-color: $acpopup_bgcolour; - border-bottom: 2px solid $acpopup_bordercolour; -} - -.photo-top-album-name { - background-color: $acpopup_bgcolour; -} - #photos-upload-perms-menu, #photos-upload-perms-menu:visited, #photos-upload-perms-menu:link { color: #8888FF; text-decoration: none; diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl index bfa62f1b7..8607b8ee8 100755 --- a/view/tpl/conv_item.tpl +++ b/view/tpl/conv_item.tpl @@ -15,7 +15,7 @@ <div class="wall-item-photo-end" style="clear:both"></div> </div> {{if $item.title}} - <div class="wall-item-title" id="wall-item-title-{{$item.id}}"><h3>{{$item.title}}</h3></div> + <div class="wall-item-title" id="wall-item-title-{{$item.id}}"><h3>{{if $item.plink}}<a href="{{$item.plink.href}}" title="{{$item.title}} ({{$item.plink.title}})">{{/if}}{{$item.title}}{{if $item.plink}}</a>{{/if}}</h3></div> {{/if}} {{if $item.lock}} <div class="wall-item-lock dropdown"> |