diff --git a/apps/plus_groups/templates/group_item.html b/apps/plus_groups/templates/group_item.html index bac7c4e9..46d11a71 100644 --- a/apps/plus_groups/templates/group_item.html +++ b/apps/plus_groups/templates/group_item.html @@ -12,6 +12,6 @@
{% trans "Description" %}:
{% autoescape off %}{{group.description|truncatewords_html:20}}{% endautoescape %}
{% trans "Members" %}:
-
{% blocktrans %}{{no_of_members}} members{% endblocktrans %}
+
{% blocktrans %}{{no_of_members}} members{% endblocktrans %}
diff --git a/apps/profiles/templates/profile_item.html b/apps/profiles/templates/profile_item.html index c7b2f86a..01e063e7 100644 --- a/apps/profiles/templates/profile_item.html +++ b/apps/profiles/templates/profile_item.html @@ -10,13 +10,13 @@
{% trans "Name" %}
{{user.get_display_name}}
-
{% trans "Organisation" %}:
+
{% trans "Organisation" %}:
{{user.organisation}}
{{main_hub_name}}:
{{homehub.display_name}}
- {% ifequal user.username 'admin' %}{% else %} + {% ifequal user.username 'admin' %}{% else %}
{% trans "Connections" %}:
@@ -25,7 +25,7 @@ {{user.get_display_name}} {% trans "is following you" %}. {% endif %} - +
{% if i_follow %} {% trans "You are following" %} {{user.get_display_name}}. {% trans "Stop following"%} @@ -36,7 +36,7 @@ {% endif %}
- +
{% trans "Send private message to" %} {{user.first_name}} diff --git a/documents/codemap.txt b/documents/codemap.txt index d6d582ad..49a2baaa 100644 --- a/documents/codemap.txt +++ b/documents/codemap.txt @@ -7,7 +7,7 @@ In general Hub+ uses standard django apps. We started with a number of pinax app 2. We have created our own permissions system, which is much more powerful than the stock django permissions. This is the major difference in how you need to code Hub+ apps which are permission aware as compared with standard django. i) All classes (content_types) which are permissioned are patched at start up to become "permissionable", including: - a) being assigned a GenericReference (a persistent unique identifier of any object through a sql table indirection). + a) being assigned a GenericReference (a persistent unique identifier of any object through a sql table indirection). b) adding various methods for permissions management c) modifying the manager to support permissioned fetching of objects see: apps/plus_permissions/permissionable.py:security_patch @@ -22,17 +22,17 @@ iii) When rendering to templates to avoid attribute errors on forbidden attribut The Permissions Model --------------------- -Permissions are a three-way mapping between Agent (User or a Group who has rights), a permissioned object (e.g. document, page, group), and an interface to the permissioned object (e.g. 'View', 'Edit', 'Change Permissions' etc). +Permissions are a three-way mapping between Agent (User or a Group who has rights), a permissioned object (e.g. document, page, group), and an interface to the permissioned object (e.g. 'View', 'Edit', 'Change Permissions' etc). -In practice, we define a number of SecurityContexts each of which may correspond to an object or a set of objects e.g. a page, or all pages in a particular group. +In practice, we define a number of SecurityContexts each of which may correspond to an object or a set of objects e.g. a page, or all pages in a particular group. -Access to objects in the SecurityContext is then mediated by the SecurityTag model. A SecurityTag is a mapping between a SecurityContext, an Interface and a set of Agents. Each agent in the set can access the attributes and methods of each object in the SecurityContext that are specified in the Interface definition. +Access to objects in the SecurityContext is then mediated by the SecurityTag model. A SecurityTag is a mapping between a SecurityContext, an Interface and a set of Agents. Each agent in the set can access the attributes and methods of each object in the SecurityContext that are specified in the Interface definition. A user can access an interface via their membership of groups. Users acquire permissions from the Agents (groups) they are members of, and group recursively acquire permissions from groups they are members of. Redis Caching ------------- -In order to evaluate permissions, we need to know which 'Agents' a particular user has. e.g. what groups they are a member of. Because groups can be members of groups, this calculation is recursive and potentially computationally intensive. We therefore use redis to cache the agents (groups) which any particular user can access object through. +In order to evaluate permissions, we need to know which 'Agents' a particular user has. e.g. what groups they are a member of. Because groups can be members of groups, this calculation is recursive and potentially computationally intensive. We therefore use redis to cache the agents (groups) which any particular user can access object through. UserInterface to the Permission Model @@ -68,7 +68,7 @@ class WikiPageEditor: stub = InterfaceWriteProperty author = InterfaceWriteProperty author = InterfaceReadProperty - + If an object is security wrapped for a particular user who has the "WikiPageEditor" interface, then they will be able to readand write the security wrapped object accordingly. @@ -82,10 +82,10 @@ Important Apps (in the apps. directory) Currently, we haven't changed the app. But the templates directory contains our own static pages. 2) account -Forked from Pinax original. -Important functions in view.py include +Forked from Pinax original. +Important functions in view.py include - home() which handles front page for both logged-in and non logged-in users (including getting from our own Feed app.) -- apply(), site_invite(), and proxied signup functions based on our own generic proxying structure - hmac_proxy which is part of the plus permission app. +- apply(), site_invite(), and proxied signup functions based on our own generic proxying structure - hmac_proxy which is part of the plus permission app. There are some other original account management functions left over in views.py which are not used and probably incompatible with current Hub+ 3) avatar @@ -96,20 +96,20 @@ Captures the 403 error and gives it a different page. This is where we'd *like* *) django_evolution (copy of evolution, an app. which helps you evolve the db-schema when the ORM schema evolves, not changed) - this should probably be an external app. -*) friends_app +*) friends_app Not used -*) messages +*) messages Forked from Pinax original. The inter-user messaging app. The main changes here are to do with putting the functions within a single tabbed page as UI. The data-model for messages is unchanged, but we now have new urls which call a view in_out_trash_comp(), a single view function which replaces the earlier in / out / trash and compose views. -*) microblogging +*) microblogging This is the original Pinax microblogging app. which we've forked. I was in the process of moving from this to the new "plus_feed" app. but there's still some parts of this in use. Ideally, all important feed-related code should be migrated to plus_feed and microblogging should be decommissioned. -Important in models.py : -We no longer use TweetInstance or Tweet for individual messages, but we do still use the Following class (and the FollowingManager) to represent and manipulat who's following who. +Important in models.py : +We no longer use TweetInstance or Tweet for individual messages, but we do still use the Following class (and the FollowingManager) to represent and manipulat who's following who. In terms of views.py / urls.py we still use the views for managing follower relationships (mainly toggle_follow and toggle_group) AND for posting a new tweet (via. new ajax UI) @@ -121,25 +121,25 @@ New app. for FeedItems. models.py defines the new FeedItem class and the FeedMan *) plus_flakes (never started, should be removed if found) -*) plus_comments +*) plus_comments Intended as a custom wrapper around the default django threaded-comments app. This is where we'd be able to modify the comments to fit them into our permissioning / notification feed framework. However, comments are still *currently* relying on the standard Django threaded_comments app. (Which is in site-packages) -*) plus_permissions +*) plus_permissions An all new app. to support our permissioning framework. Includes models, views. Importantly, decorators for wrapping other views to ensure that they permission-protect objects that they work with. All the permission testing code lives in this app including "has_access" (in models). *) plus_wiki Our new app. that defines a WikiPage. Note that our WikiPages are subclasses of a class called "ResourceCommon" defined in the plus_groups app. resources_common.py which has the common code for handling anything that lives "inside" a TgGroup. *) synced -The app. for making syncer connections with HubSpace. Syncer calls *into* Hub+ via http (handlers in views.py). Hub+ talks out to syncer through the functions in sync_tools.py. models.py is used just to keep a single dictionary of the connection id in the database (only place we can guarantee it's seen everywhere in django). __init__.py sets up the single-sign on. +The app. for making syncer connections with HubSpace. Syncer calls *into* Hub+ via http (handlers in views.py). Hub+ talks out to syncer through the functions in sync_tools.py. models.py is used just to keep a single dictionary of the connection id in the database (only place we can guarantee it's seen everywhere in django). __init__.py sets up the single-sign on. *) plus_contacts A new app. designed for managing lists of Applications and Contacts. In Hub+ every new application or invite creates a Contact. If the Contact goes through the right process of accepting an invitation or having an appllication accepted, a User is created. models.py defines Applications and Contacts (+ the logic of changing status) -*) plus_groups +*) plus_groups Our main app. that wraps a TgGroup model table (originally from HubSpace) and uses it as the main organizing principle for people and content within Hub+. -A couple of notes : +A couple of notes : - Hubs are just a particular kind of TgGroup - models.py also handles group membership, views.py handles group joing / leaving - views.py also has various functions for setting up searches within groups @@ -152,17 +152,17 @@ A couple of notes : *) plus_resources -This is a new app. Slightly confusingly named. "Resource" is a model representing uploaded files. Files are always uploaded within a group. +This is a new app. Slightly confusingly named. "Resource" is a model representing uploaded files. Files are always uploaded within a group. Resources are a subclass of ResourceCommon (from plus_groups) - + *) profiles The original Pinax Profile class has been changed significantly. One of the main changes is that we share data between Hub+ and HubSpace in the same database. And HubSpace stores information in its user class (tg_user table) Therefore, we've changed Profile so that many fields are now proxies to equivalent fields that we've hacked into Django's User class (see plus_user). Code for this is in models.py. -The profiles app. also defines HostQuestions, survey questions that were requested by hosts and psychosocial. Ideally, these should be moved to individual generic questions so that hosts can define their own polls. +The profiles app. also defines HostQuestions, survey questions that were requested by hosts and psychosocial. Ideally, these should be moved to individual generic questions so that hosts can define their own polls. *) photos (not used) diff --git a/documents/hubplus0.9.txt b/documents/hubplus0.9.txt index 348b4ff5..e78823e7 100644 --- a/documents/hubplus0.9.txt +++ b/documents/hubplus0.9.txt @@ -5,7 +5,7 @@ User *Tom* *Phil* - follow - status - - message + - message - hostinfo - Regions - links @@ -13,7 +13,7 @@ User *Tom* Phil please (tom's wishlist): -- apply wiki naming to group name. +- apply wiki naming to group name. - begin work on uploads - happy to help, particularly around the image previews etc @@ -41,7 +41,7 @@ Tags *Tom* - you should only see the add tag form if you have permission on the tagger_for user. Same for delete. Phil - host info security setup - - ordering of lists, members, hosts (group page) and groups (profile page) + - ordering of lists, members, hosts (group page) and groups (profile page) Attribute Editing - Phil @@ -52,7 +52,7 @@ Attribute Editing - Phil hubspace -------- -rename member level hub groups from "group members" to "group" +rename member level hub groups from "group members" to "group" misc ---- @@ -70,11 +70,11 @@ Permissions Users and Profiles. - Profile acquire their SecurityContext from Users - We don't *customize* Profile security, in the sense of creating a specific Profile SecurityContext, we just edit the User - + Further Changes - we need to distinguish whether its possible to "customized permmisions" (add new security context for this object) -- one child (child types - single or multiple) - - uncustomised view + - uncustomised view - put a "broad type" (permission_prototype) on security agents which can be used to store the "public" / "private" / "invited" et. distintion - restrict tabs showing sliders, according to ManagePermissions interface - labels on the sliders ... (use the _ functions ) @@ -110,11 +110,11 @@ Monday 25th - 1st September - Phil MHPSS imports - Tom - js browser issues - Tom + Shekhar - hubspace integration - + Tuesday 1st September --------------------- -Begin Testing! With Hosts and MHPSS. Data not stored +Begin Testing! With Hosts and MHPSS. Data not stored 1st - 15th ---------- @@ -139,7 +139,7 @@ Groups ------ HP - 0.9 -Join/Leave/Invite/Apply to Join/Set Status/Edit Home Page, interfaces with permissions control +Join/Leave/Invite/Apply to Join/Set Status/Edit Home Page, interfaces with permissions control Sign up Process Inplace Fields / Attributes tag group as "about ..." @@ -152,7 +152,7 @@ Host Group (default to only visible to its members) Hubs ---- Create Hub object (members group with associated location) -Bring in Location Data for Hub +Bring in Location Data for Hub Invoicing - HP 0.9/1.0 @@ -167,16 +167,16 @@ HP 0.9 - look at django-tagging - fix existing tagging - tag refinements search ... urls: ${}/tag/sustainability+renewable_energy '+' is AND and _ is "separator" - - maintain table of tag relations with intersection counts - map this by the amount of objects actually accessible. + - maintain table of tag relations with intersection counts - map this by the amount of objects actually accessible. - tag tweets, pages, events - only see the tagged items you have permission to -- your feed / group feed - customise with multiple searches, tags of the users and groups you are following. +- your feed / group feed - customise with multiple searches, tags of the users and groups you are following. - Filter feed by tags, "user as group"? (author), title, fulltext (keyword), - Order by date, author, title. Save filter + sorting combination - field search/filter - attribute:value - fulltext search/filter - http://code.google.com/p/django-solr-search/ OR http://github.com/dcramer/django-sphinx/ http://haystacksearch.org/docs/ http://pypi.python.org/pypi/pdfminer/ - get text from pdf docs - EASY -http://www.unixuser.org/~euske/python/pdfminer/index.html +http://www.unixuser.org/~euske/python/pdfminer/index.html http://wiki.services.openoffice.org/wiki/PyUNO_bridge + openoffice - to extract word docs - HARD @@ -213,7 +213,7 @@ include hubspace notes Speed up pinax HP 0.9 -------------- concat js and serve as gzipped http://www.ohloh.net/p/django-compress ? -use lightty for static files +use lightty for static files django-mptt Financial + User data export HP 0.9 diff --git a/documents/unavailable.html b/documents/unavailable.html index ab167363..a9043dcf 100644 --- a/documents/unavailable.html +++ b/documents/unavailable.html @@ -1,7 +1,7 @@ - +

Hubspace is Temporarily Unavailable

Hubspace will be down on Sunday, 21st February for planned maintainence.

diff --git a/install.txt b/install.txt index 72c5cf4d..6de6dfb5 100644 --- a/install.txt +++ b/install.txt @@ -4,7 +4,7 @@ Application setup ----------------- # create psn user -useradd -m -s /bin/bash psn +useradd -m -s /bin/bash psn # get python dev apt-cache search python-dev @@ -16,8 +16,8 @@ sudo mkdir opt/apphomes sudo mkdir opt/apphomes/mhpss cd opt/apphomes -sudo chown -R psn:adm mhpss/ -cd mhpss +sudo chown -R psn:adm mhpss/ +cd mhpss # become psn user sudo -i -u psn @@ -26,21 +26,21 @@ sudo -i -u psn git clone git://github.com/pinax/pinax.git #check the tags available -git-tag -l +git-tag -l # NOTE that this makes a new branch called mhpss (containing the tag version 0.7beta3 git checkout -b mhpss 0.7beta3 # edit pinax-boot.py --> comment out django 1.0.4 and add 1.1 -python scripts/pinax-boot.py --development --django-version=1.1 /opt/apphomes/mhpss/pinax +python scripts/pinax-boot.py --development --django-version=1.1 /opt/apphomes/mhpss/pinax source ./pinax-env/bin/activate # get our hub+ repo git clone git://github.com/thehub/hubplus.git hubplus -# and run the startup the following script which adds a git-hook to your repo. May do more in future +# and run the startup the following script which adds a git-hook to your repo. May do more in future ./on_clone/RUNME.sh @@ -72,7 +72,7 @@ sudo apt-get install postgresql sudo cp -a /etc/postgresql/8.3/main/postgresql.conf /etc/postgresql/8.3/main/postgresql.conf.ORIG sudo cp -a /etc/postgresql/8.3/main/pg_hba.conf /etc/postgresql/8.3/main/pg_hba.conf.ORIG -# In Postgresql's config, set directive "listen_addresses" to +# In Postgresql's config, set directive "listen_addresses" to # the local *private* IP address sudo sed -e "s/^#\(listen_addresses =\) 'localhost'/\1 '172.24.2.72'/" -i /etc/postgresql/8.3/main/postgresql.conf @@ -109,15 +109,15 @@ pg_dump -U thehub -Fc psn > new.dump On mhpss-db : # as admin -cd +cd rcp phil@pinaxdev.the-hub.net:/home/phil/test/pinax-env/psn_demo/new.dump . # make sure you copy to somewhere where admin can write and user postgres can read # become postgres -sudo -i -u postgres +sudo -i -u postgres -# +# dropdb psn createdb psn @@ -126,7 +126,7 @@ pg_restore -O -U psn -d psn new.dump # find the password for user psn in the local_settings on the app server -Pulling files +Pulling files ------------- Login to mhpss-app as admin-xx (eg. admin-pj) @@ -167,9 +167,9 @@ HubPlus' fulltext search uses Django-Haystack so in theory you could use lots of Go to the index server : # create psn user -useradd -m -s /bin/bash psn +useradd -m -s /bin/bash psn -# get python dev (including jetty) +# get python dev (including jetty) sudo apt-get install git-core curl emacs22-nox jetty python-setuptools # stop standard jetty server (we don't want it to become a public web-server) @@ -178,7 +178,7 @@ sudo rm /etc/rc2.d/S20jetty cd /opt sudo mkdir homeapps -sudo mkdir homeapps/solr +sudo mkdir homeapps/solr chown -R psn:adm homeapps @@ -218,9 +218,9 @@ python manage.py build_solr_schema To reindex your data -------------------- -python manage.py rebuild_index +python manage.py rebuild_index # or once the index has been created -python manage.py update_index +python manage.py update_index Supervisord @@ -230,10 +230,10 @@ The supervisord is a python program to manage a number of processes, which we'll On the index server -# Install +# Install sudo easy_install supervisor -# +# # restart supervisor sudo /etc/init.d/supervisord restart @@ -258,7 +258,7 @@ Configuring Lighttpd # After any change, always run syntax checking - + lighttpd -t -f /etc/lighttpd/lighttpd.conf # restart lighty (or reload could be faster) @@ -275,6 +275,6 @@ tar xvzf redis-1.02.tar.gz cd redis-1.02 make -# test run the redis server with +# test run the redis server with ./redis-server # but would be better to put this under supervisord control diff --git a/media/base.css b/media/base.css index 668aece2..9fe76985 100644 --- a/media/base.css +++ b/media/base.css @@ -218,7 +218,7 @@ span.notice_time { table.notice_settings td { line-height: 90%; padding: 5px 10px; - + } span.notice_type_description { color: #666; @@ -429,15 +429,15 @@ div.tweet .reply { padding: 2px 5px; cursor: default; display: block; - /* - if width will be 100% horizontal scrollbar will apear + /* + if width will be 100% horizontal scrollbar will apear when scroll mode will be used */ /*width: 100%;*/ font: menu; font-size: 12px; - /* - it is very important, if line-height not setted or setted + /* + it is very important, if line-height not setted or setted in relative units scroll will be broken in firefox */ line-height: 16px; @@ -565,7 +565,7 @@ p.what_next { float: left; margin-left: 30px; } -.blog-post-meta img { +.blog-post-meta img { border: 1px solid #666; } .blog-list tr.odd { @@ -643,7 +643,7 @@ h2.task_resolved, h2.task_closed { padding: 20px 0; } .gallery-photo-thumb { - width: 100px; + width: 100px; margin: 10px 10px 20px 0; float: left; text-align: center; @@ -755,7 +755,7 @@ div.embed { font-size: 11px; } -#basic-form .button{ +#basic-form .button{ clear:both; width:125px; height:31px; @@ -829,5 +829,5 @@ div#ymap { width: 350px; height: 200px; float: right; - border: 1px solid gray; + border: 1px solid gray; } \ No newline at end of file diff --git a/media/base.js b/media/base.js index 80cfd461..57726e42 100644 --- a/media/base.js +++ b/media/base.js @@ -13,11 +13,11 @@ $(function() { var ymap = document.getElementById('ymap'); if(ymap) { var map = new YMap(ymap); - // Add map type control - map.addTypeControl(); - // Add map zoom (long) control - map.addZoomLong(); - // Add the Pan Control + // Add map type control + map.addTypeControl(); + // Add map zoom (long) control + map.addZoomLong(); + // Add the Pan Control map.addPanControl(); for(var i = 0; i < _geo.length; ++i) { var g = _geo[i]; @@ -30,7 +30,7 @@ $(function() { var myMarkerContent = g[2]; // When the marker is clicked, show the SmartWindow YEvent.Capture(myMarker, EventsList.MouseClick, function() { - myMarker.openSmartWindow(myMarkerContent); + myMarker.openSmartWindow(myMarkerContent); }); // Put the marker on the map map.addOverlay(myMarker); diff --git a/media/jquery.bgiframe.js b/media/jquery.bgiframe.js index 7faef4b3..e292b8da 100644 --- a/media/jquery.bgiframe.js +++ b/media/jquery.bgiframe.js @@ -1,5 +1,5 @@ /* Copyright (c) 2006 Brandon Aaron (http://brandonaaron.net) - * Dual licensed under the MIT (http://www.opensource.org/licenses/mit-license.php) + * Dual licensed under the MIT (http://www.opensource.org/licenses/mit-license.php) * and GPL (http://www.opensource.org/licenses/gpl-license.php) licenses. * * $LastChangedDate: 2007-07-22 01:45:56 +0200 (Son, 22 Jul 2007) $ diff --git a/media/jquery.dimensions.js b/media/jquery.dimensions.js index 4c80c2f2..c39c6369 100644 --- a/media/jquery.dimensions.js +++ b/media/jquery.dimensions.js @@ -11,33 +11,33 @@ */ (function($){ - + $.dimensions = { version: '@VERSION' }; // Create innerHeight, innerWidth, outerHeight and outerWidth methods $.each( [ 'Height', 'Width' ], function(i, name){ - + // innerHeight and innerWidth $.fn[ 'inner' + name ] = function() { if (!this[0]) return; - + var torl = name == 'Height' ? 'Top' : 'Left', // top or left borr = name == 'Height' ? 'Bottom' : 'Right'; // bottom or right - + return this[ name.toLowerCase() ]() + num(this, 'padding' + torl) + num(this, 'padding' + borr); }; - + // outerHeight and outerWidth $.fn[ 'outer' + name ] = function(options) { if (!this[0]) return; - + var torl = name == 'Height' ? 'Top' : 'Left', // top or left borr = name == 'Height' ? 'Bottom' : 'Right'; // bottom or right - + options = $.extend({ margin: false }, options || {}); - + return this[ name.toLowerCase() ]() + num(this, 'border' + torl + 'Width') + num(this, 'border' + borr + 'Width') + num(this, 'padding' + torl) + num(this, 'padding' + borr) @@ -49,19 +49,19 @@ $.each( [ 'Height', 'Width' ], function(i, name){ $.each( ['Left', 'Top'], function(i, name) { $.fn[ 'scroll' + name ] = function(val) { if (!this[0]) return; - + return val != undefined ? - + // Set the scroll offset this.each(function() { this == window || this == document ? - window.scrollTo( + window.scrollTo( name == 'Left' ? val : $(window)[ 'scrollLeft' ](), name == 'Top' ? val : $(window)[ 'scrollTop' ]() ) : this[ 'scroll' + name ] = val; }) : - + // Return the scroll offset this[0] == window || this[0] == document ? self[ (name == 'Left' ? 'pageXOffset' : 'pageYOffset') ] || @@ -74,33 +74,33 @@ $.each( ['Left', 'Top'], function(i, name) { $.fn.extend({ position: function() { var left = 0, top = 0, elem = this[0], offset, parentOffset, offsetParent, results; - + if (elem) { // Get *real* offsetParent offsetParent = this.offsetParent(); - + // Get correct offsets offset = this.offset(); parentOffset = offsetParent.offset(); - + // Subtract element margins offset.top -= num(elem, 'marginTop'); offset.left -= num(elem, 'marginLeft'); - + // Add offsetParent borders parentOffset.top += num(offsetParent, 'borderTopWidth'); parentOffset.left += num(offsetParent, 'borderLeftWidth'); - + // Subtract the two offsets results = { top: offset.top - parentOffset.top, left: offset.left - parentOffset.left }; } - + return results; }, - + offsetParent: function() { var offsetParent = this[0].offsetParent; while ( offsetParent && (!/^body|html$/i.test(offsetParent.tagName) && $.css(offsetParent, 'position') == 'static') ) diff --git a/my_grep.sh b/my_grep.sh index ede7e0b9..e495c072 100755 --- a/my_grep.sh +++ b/my_grep.sh @@ -1,3 +1,3 @@ #!/bin/bash -grep -r $1 $2 | grep -v 'pyc' | grep -v 'py~' | grep -v 'py#' | grep -v 'Binary' \ No newline at end of file +grep -r $1 $2 | grep -v 'pyc' | grep -v 'py~' | grep -v 'py#' | grep -v 'Binary' \ No newline at end of file diff --git a/on_clone/RUNME.sh b/on_clone/RUNME.sh index 96bf2ed6..f061dfa4 100755 --- a/on_clone/RUNME.sh +++ b/on_clone/RUNME.sh @@ -15,5 +15,5 @@ ensure 'css' ensure 'js' ensure 'themes' ensure 'images' -ensure 'member_res' +ensure 'member_res' ensure 'avatars' diff --git a/scripts/patches.sh b/scripts/patches.sh index c886f81b..4688853c 100755 --- a/scripts/patches.sh +++ b/scripts/patches.sh @@ -2,7 +2,7 @@ python manage.py execfile scripts/patch_permissions.py # patch the all_members group to have "display_name" from theme settings -python manage.py execfile scripts/patch_all_members.py +python manage.py execfile scripts/patch_all_members.py # assign virtual homehub to those who have none python manage.py execfile scripts/fix_homehub.py \ No newline at end of file diff --git a/site_media_src/css/forms.css b/site_media_src/css/forms.css index 60154a72..aa99e383 100644 --- a/site_media_src/css/forms.css +++ b/site_media_src/css/forms.css @@ -72,10 +72,10 @@ textarea { width: 300px; } input.link_text { - width: 90%; + width: 90%; } input.url_text { - width: 90%; + width: 90%; } .large input.text, input.text.large { @@ -375,7 +375,7 @@ form fieldset .checkboxes select { border-color: #bbb #999 #999 #bbb; color : #222; cursor : pointer; - padding : 3px 5px 3px; + padding : 3px 5px 3px; text-transform : uppercase; } diff --git a/site_media_src/css/header.css b/site_media_src/css/header.css index 175fe694..b15495ba 100644 --- a/site_media_src/css/header.css +++ b/site_media_src/css/header.css @@ -30,7 +30,7 @@ right : 0; top : 0; } - + #header #account_navigation li { float : left; margin-left : 15px; @@ -66,7 +66,7 @@ font-size : 1.6em; letter-spacing : 1px; line-height : 1.4em; - list-style : none; + list-style : none; position : absolute; right : 0; } diff --git a/site_media_src/css/jit.css b/site_media_src/css/jit.css index c919cfaa..a9820790 100644 --- a/site_media_src/css/jit.css +++ b/site_media_src/css/jit.css @@ -25,8 +25,8 @@ background-color: black; } -#tags #left-container, -#tags #right-container, +#tags #left-container, +#tags #right-container, #tags #center-container { height:600px; position:absolute; @@ -48,7 +48,7 @@ background-image:url('col2.png'); background-position:center right; border-left:1px solid #ddd; - + } #tags #right-container { diff --git a/site_media_src/css/jquery.autocomplete.css b/site_media_src/css/jquery.autocomplete.css index 91b62283..416cde1b 100644 --- a/site_media_src/css/jquery.autocomplete.css +++ b/site_media_src/css/jquery.autocomplete.css @@ -19,15 +19,15 @@ padding: 2px 5px; cursor: default; display: block; - /* - if width will be 100% horizontal scrollbar will apear + /* + if width will be 100% horizontal scrollbar will apear when scroll mode will be used */ /*width: 100%;*/ font: menu; font-size: 12px; - /* - it is very important, if line-height not setted or setted + /* + it is very important, if line-height not setted or setted in relative units scroll will be broken in firefox */ line-height: 16px; diff --git a/site_media_src/css/list-edit-table.css b/site_media_src/css/list-edit-table.css index fdfa9610..3be202c5 100644 --- a/site_media_src/css/list-edit-table.css +++ b/site_media_src/css/list-edit-table.css @@ -1,4 +1,4 @@ -table.draglist { +table.draglist { position: relative; border-spacing: 10px; border-collapse: separate; @@ -12,7 +12,7 @@ table.draglist { } table.draglist tr { margin: 1px; - cursor: move; + cursor: move; background-color: #F4F4F4; border: 2px solid #560005; height: 30px; @@ -23,9 +23,9 @@ table.draglist td.add_remove { table.draglist tr a { color: #660007; } -table.draglist_alt { +table.draglist_alt { position: relative; - width: 200px; + width: 200px; list-style: none; margin:0; padding:0; @@ -33,10 +33,10 @@ table.draglist_alt { } table.draglist_alt tr { margin: 1px; - cursor: move; + cursor: move; } -#user_actions { - float: right; +#user_actions { + float: right; } div.logger{ position:absolute; @@ -45,7 +45,7 @@ div.edit_list { float: left; } div.edit_list a { - color: #660007; + color: #660007; } div#edit_list_left { height: 10px; diff --git a/site_media_src/css/main.css b/site_media_src/css/main.css index 665fb6af..f371f0c9 100755 --- a/site_media_src/css/main.css +++ b/site_media_src/css/main.css @@ -502,7 +502,7 @@ th { color : #999; font-size : 0.625em; line-height : 1em; - vertical-align : top; + vertical-align : top; } .tabbed ul.tabbed_navigation li.selected a .count { @@ -649,7 +649,7 @@ th { .results .thumb { position : absolute; left : 0; - top : 10px; + top : 10px; } .results h3, @@ -731,7 +731,7 @@ th { } .message_headers dd { - float : left; + float : left; width : 70%; } @@ -1024,7 +1024,7 @@ list-style-position:inside; /* Side Blocks: Add */ #feature_add { - margin-bottom : 10px; + margin-bottom : 10px; } diff --git a/site_media_src/css/overlay.css b/site_media_src/css/overlay.css index fda2291a..316e9952 100644 --- a/site_media_src/css/overlay.css +++ b/site_media_src/css/overlay.css @@ -1,4 +1,4 @@ -/* Overlay */ +/* Overlay */ div.overlay { /* growing background image */ @@ -8,7 +8,7 @@ div.overlay { width : 800px; height : 624px; - /* initially overlay is hidden */ + /* initially overlay is hidden */ display : none; /* some padding to layout nested elements nicely */ diff --git a/site_media_src/css/permissions.css b/site_media_src/css/permissions.css index a67609d8..db08ff61 100644 --- a/site_media_src/css/permissions.css +++ b/site_media_src/css/permissions.css @@ -11,7 +11,7 @@ HUB PLUS 2009 list-style : none; overflow : hidden; text-align : center; - position:relative; + position:relative; width : 100%; vertical-align: top; } @@ -28,7 +28,7 @@ HUB PLUS 2009 .permissions_slider .attribute_column { width : 15%; - text-align : center; + text-align : center; } .permissions_slider .group_column, diff --git a/site_media_src/css/site.css b/site_media_src/css/site.css index 9a61b79d..43ff6eed 100755 --- a/site_media_src/css/site.css +++ b/site_media_src/css/site.css @@ -102,7 +102,7 @@ body { left : 0; position : absolute; top : 0; - width : 1px; + width : 1px; visibility : hidden; } diff --git a/site_media_src/css/ui.tabs.css b/site_media_src/css/ui.tabs.css index c2ed2493..867b1e2d 100644 --- a/site_media_src/css/ui.tabs.css +++ b/site_media_src/css/ui.tabs.css @@ -15,7 +15,7 @@ background: #fff; border: 1px solid black; border-width: 1px 1px 0; - white-space: nowrap; /* required in IE 6 */ + white-space: nowrap; /* required in IE 6 */ } .ui-tabs .ui-tabs-nav li a span { display: block; padding: 0 10px 2px;} .ui-tabs .ui-tabs-nav li.ui-tabs-selected { padding-bottom: 1px; border-bottom-width: 0;} diff --git a/site_media_src/design_uploads/explore.html b/site_media_src/design_uploads/explore.html index d97b18ba..62b14eaa 100644 --- a/site_media_src/design_uploads/explore.html +++ b/site_media_src/design_uploads/explore.html @@ -270,7 +270,7 @@

Search

- + diff --git a/site_media_src/design_uploads/explore_psn.html b/site_media_src/design_uploads/explore_psn.html index 49887bd4..60f6670a 100644 --- a/site_media_src/design_uploads/explore_psn.html +++ b/site_media_src/design_uploads/explore_psn.html @@ -270,7 +270,7 @@

Search

- + diff --git a/site_media_src/design_uploads/explore_searched.html b/site_media_src/design_uploads/explore_searched.html index d6c60db3..25194d38 100644 --- a/site_media_src/design_uploads/explore_searched.html +++ b/site_media_src/design_uploads/explore_searched.html @@ -136,35 +136,35 @@

Refine by tag

  • green+
  • fairtrade+
  • design+
    • -
  • reference+
    • +
  • reference+
  • dip+
  • architecture+
  • developement+
  • hub+
    • -
  • environment+
    • +
  • environment+
  • sustainability+
  • product+
  • salad+
  • energy+
  • living+
    • -
  • shopping+
    • +
  • shopping+
    • -->
    1. green (19)+
    2. fairtrade (21)+
    3. design (16)+
      4. -
    4. reference (16)+
      5. +
    5. reference (16)+
    6. dip (16)+
    7. architecture (16)+
    8. developement (15)+
    9. hub (14)+
      10. -
    10. environment (12)+
      11. +
    11. environment (12)+
    12. sustainability (11)+
    13. product (10)+
    14. salad (5)+
    15. energy (3)+
    16. living (2)+
      17. -
    17. shopping (1)+
      18. +
    18. shopping (1)+
    @@ -306,7 +306,7 @@

    New search

    - + diff --git a/site_media_src/design_uploads/explore_searched_2.html b/site_media_src/design_uploads/explore_searched_2.html index c7ab124b..08174d64 100644 --- a/site_media_src/design_uploads/explore_searched_2.html +++ b/site_media_src/design_uploads/explore_searched_2.html @@ -139,29 +139,29 @@

    Refine by tag

  • green+
  • design+
  • developement+
    • -
  • environment+
    • +
  • environment+
  • sustainability+
  • product+
  • salad+
  • energy+
  • living+
    • -
  • shopping+
    • +
  • shopping+
    • -->
    1. green (12)+
    2. design (11)+
    3. developement (9)+
      4. -
    4. environment (9)+
      5. +
    5. environment (9)+
    6. sustainability (6)+
    7. product (4)+
    8. salad (2)+
    9. energy (2)+
    10. living (2)+
      11. -
    11. shopping (1)+
      12. +
    12. shopping (1)+
    - + @@ -173,7 +173,7 @@

    Refine by tag

  • Hubs (4)
  • Resources (3)
    • - + - + - + - Clear all | + Clear all | More options @@ -139,22 +139,22 @@

    Search

    Refine by tag

    1. design (11)+
    2. developement (9)+
      3. -
    3. environment (9)+
      4. +
    4. environment (9)+
    5. product (4)+
    6. salad (2)+
    7. energy (2)+
    8. living (2)+
      9. -
    9. shopping (1)+
      10. +
    10. shopping (1)+
    @@ -169,7 +169,7 @@

    Refine by tag

  • Hubs (4)
  • Resources (3)
    • - + - Clear all | + Clear all | More options @@ -139,22 +139,22 @@

    Search

    Refine by tag

    1. design (11)+
    2. developement (9)+
      3. -
    3. environment (9)+
      4. +
    4. environment (9)+
    5. product (4)+
    6. salad (2)+
    7. energy (2)+
    8. living (2)+
      9. -
    9. shopping (1)+
      10. +
    10. shopping (1)+
    @@ -169,7 +169,7 @@

    Refine by tag

  • Regions (4)
  • Resources (3)
    • - + - + - +