Yasin [Wed, 25 Sep 2013 10:31:56 +0000 (12:31 +0200)]
Error message moved to a better place
Yasin [Wed, 25 Sep 2013 10:28:44 +0000 (12:28 +0200)]
Merge branch 'master' of ssh://git.onelab.eu/git/myslice
Yasin [Wed, 25 Sep 2013 10:28:37 +0000 (12:28 +0200)]
Fix: models.py [removed depricated section], registration: fix minor bugs in view and templates. [jquery.validate.js not working]
Thierry Parmentelat [Wed, 25 Sep 2013 10:00:22 +0000 (12:00 +0200)]
form hints are back in business on the registration page
could easily be added to the other forms as well but this would need some moving around (registration.css is wrong) and changes to the layouts (hint takes the available 4 columns remaining on the right of the grid)
Thierry Parmentelat [Wed, 25 Sep 2013 09:34:15 +0000 (11:34 +0200)]
show up fields error if any
Thierry Parmentelat [Wed, 25 Sep 2013 09:10:26 +0000 (11:10 +0200)]
slice request view tweaked for bootstrap3
Thierry Parmentelat [Wed, 25 Sep 2013 09:09:58 +0000 (11:09 +0200)]
cleaned up the contact template
Thierry Parmentelat [Wed, 25 Sep 2013 09:02:09 +0000 (11:02 +0200)]
tweaked the contact view for bootstrap3
Thierry Parmentelat [Wed, 25 Sep 2013 08:57:40 +0000 (10:57 +0200)]
discard deprecated code
Thierry Parmentelat [Wed, 25 Sep 2013 08:51:02 +0000 (10:51 +0200)]
this should have gone with the dashboard tweak, more thorough cleanup of css
Thierry Parmentelat [Wed, 25 Sep 2013 07:39:44 +0000 (09:39 +0200)]
bootsstrap'ified dashboard - 3 columns layout, much less css again
Mohamed Larabi [Tue, 24 Sep 2013 17:24:11 +0000 (19:24 +0200)]
Merge branch 'master' of ssh://git.onelab.eu/git/myslice
Mohamed Larabi [Tue, 24 Sep 2013 17:24:04 +0000 (19:24 +0200)]
wsgi conf
Thierry Parmentelat [Tue, 24 Sep 2013 16:25:15 +0000 (18:25 +0200)]
Merge branch 'master' of ssh://git.onelab.eu/git/myslice
Thierry Parmentelat [Tue, 24 Sep 2013 16:22:13 +0000 (18:22 +0200)]
a very rough rework of the registration page using bootstrap
the css ends up almost empty
OTOH there might be features that I don't know well (hints for one, maybe others) that do not work well anymore
Mohamed Larabi [Tue, 24 Sep 2013 16:14:15 +0000 (18:14 +0200)]
pkg fix
Mohamed Larabi [Tue, 24 Sep 2013 15:57:55 +0000 (17:57 +0200)]
Merge branch 'master' of ssh://git.onelab.eu/git/myslice
Mohamed Larabi [Tue, 24 Sep 2013 15:57:46 +0000 (17:57 +0200)]
pkg fix
Yasin [Tue, 24 Sep 2013 15:48:35 +0000 (17:48 +0200)]
Merge branch 'master' of ssh://git.onelab.eu/git/myslice
Yasin [Tue, 24 Sep 2013 15:48:31 +0000 (17:48 +0200)]
FIX: Bootstrap.css to get back old design
Mohamed Larabi [Tue, 24 Sep 2013 15:41:18 +0000 (17:41 +0200)]
pkg fix
Mohamed Larabi [Tue, 24 Sep 2013 15:25:19 +0000 (17:25 +0200)]
Merge branch 'master' of ssh://git.onelab.eu/git/myslice
Mohamed Larabi [Tue, 24 Sep 2013 15:25:15 +0000 (17:25 +0200)]
use absolute path
Yasin [Tue, 24 Sep 2013 14:57:41 +0000 (16:57 +0200)]
FIX: css to comply with bootstrap v3.0.0
Yasin [Tue, 24 Sep 2013 14:40:22 +0000 (16:40 +0200)]
FIX: minor MyAccount
Yasin [Tue, 24 Sep 2013 14:36:47 +0000 (16:36 +0200)]
MyAccount: Restriction added[user needs acc in myslice platform to gen,upload,dl,delete]
Mohamed Larabi [Tue, 24 Sep 2013 14:02:07 +0000 (16:02 +0200)]
Update packaging
Mohamed Larabi [Tue, 24 Sep 2013 13:59:39 +0000 (15:59 +0200)]
fix apache wsgi config
Thierry Parmentelat [Tue, 24 Sep 2013 13:57:32 +0000 (15:57 +0200)]
nicer login widget
Thierry Parmentelat [Tue, 24 Sep 2013 13:53:05 +0000 (15:53 +0200)]
trashed bootstrap 2.3.1
Thierry Parmentelat [Tue, 24 Sep 2013 13:44:40 +0000 (15:44 +0200)]
Merge branch 'master' of ssh://git.onelab.eu/git/myslice
Thierry Parmentelat [Tue, 24 Sep 2013 13:43:59 +0000 (15:43 +0200)]
restore link from onelab logo to /
Thierry Parmentelat [Tue, 24 Sep 2013 13:43:20 +0000 (15:43 +0200)]
trimmed footer in onelab logo that was not helping
Yasin [Tue, 24 Sep 2013 13:36:37 +0000 (15:36 +0200)]
REDME: $ make redo included
Thierry Parmentelat [Tue, 24 Sep 2013 13:27:24 +0000 (15:27 +0200)]
dropdown topmenu comes aith a down caret
Thierry Parmentelat [Tue, 24 Sep 2013 13:05:31 +0000 (15:05 +0200)]
fix the pagination area for hazelnut with bootstrap 3
using 'full_numbers' for now
Thierry Parmentelat [Tue, 24 Sep 2013 12:59:11 +0000 (14:59 +0200)]
fix location of png backgrounds for list headers
Thierry Parmentelat [Tue, 24 Sep 2013 12:53:30 +0000 (14:53 +0200)]
comment out reference to jquery-ui.css that is not present in static/ yet
Thierry Parmentelat [Tue, 24 Sep 2013 12:52:22 +0000 (14:52 +0200)]
googlemap a bit higher
Thierry Parmentelat [Tue, 24 Sep 2013 10:49:46 +0000 (12:49 +0200)]
Merge branch 'master' of ssh://git.onelab.eu/git/myslice
Thierry Parmentelat [Tue, 24 Sep 2013 10:48:17 +0000 (12:48 +0200)]
toplevel menu template has support for dropdowns
for now this is used to make the list smaller (read, less wide)
Yasin [Tue, 24 Sep 2013 09:55:00 +0000 (11:55 +0200)]
Merge branch 'master' of ssh://git.onelab.eu/git/myslice
Yasin [Tue, 24 Sep 2013 09:54:56 +0000 (11:54 +0200)]
MyAccount: Delete key in progress
Thierry Parmentelat [Tue, 24 Sep 2013 09:20:41 +0000 (11:20 +0200)]
first rough restoration of unfold1 unfold2 under boostrap v3
Thierry Parmentelat [Tue, 24 Sep 2013 09:18:32 +0000 (11:18 +0200)]
css comment is /* */ - not #
Thierry Parmentelat [Tue, 24 Sep 2013 09:18:02 +0000 (11:18 +0200)]
reorder apps to show trash/ and sample/ last - as they should go away
Thierry Parmentelat [Tue, 24 Sep 2013 08:47:44 +0000 (10:47 +0200)]
topmenu revisited for bootstrap v3
Mohamed Larabi [Mon, 23 Sep 2013 15:39:24 +0000 (17:39 +0200)]
restart apache at the end of the install
Mohamed Larabi [Mon, 23 Sep 2013 15:38:20 +0000 (17:38 +0200)]
add folder debug_platform to unfold install
Mohamed Larabi [Mon, 23 Sep 2013 15:01:07 +0000 (17:01 +0200)]
plug myslice into apache in post-install
Mohamed Larabi [Mon, 23 Sep 2013 15:00:11 +0000 (17:00 +0200)]
add apache2 and libapache2-mod-wsgi to unfold dependencies
Mohamed Larabi [Mon, 23 Sep 2013 14:50:14 +0000 (16:50 +0200)]
myslice and unfold location is /usr/share/unfold
Mohamed Larabi [Mon, 23 Sep 2013 14:47:26 +0000 (16:47 +0200)]
deb pkg: add folder sample and trash to unfold install
Mohamed Larabi [Mon, 23 Sep 2013 14:46:43 +0000 (16:46 +0200)]
Merge branch 'master' of ssh://git.onelab.eu/git/myslice
Thierry Parmentelat [Mon, 23 Sep 2013 14:43:52 +0000 (16:43 +0200)]
move a few things away in to-be-integrated/
also fix for loginrequired (somehow it was not found in views/)
Yasin [Mon, 23 Sep 2013 14:33:41 +0000 (16:33 +0200)]
Fix: merge conflict
Yasin [Mon, 23 Sep 2013 14:31:07 +0000 (16:31 +0200)]
MyAccount: Download pubkey+priv key- OK
Mohamed Larabi [Mon, 23 Sep 2013 13:40:17 +0000 (15:40 +0200)]
deb pkg: add folder myslice to unfold install
Mohamed Larabi [Mon, 23 Sep 2013 13:11:05 +0000 (15:11 +0200)]
deb pkg: myslice pkg contains only portal
Thierry Parmentelat [Mon, 23 Sep 2013 12:59:12 +0000 (14:59 +0200)]
trash updater
Thierry Parmentelat [Mon, 23 Sep 2013 12:56:29 +0000 (14:56 +0200)]
uniform plugin layout with code in __init__.py
Thierry Parmentelat [Mon, 23 Sep 2013 12:42:26 +0000 (14:42 +0200)]
rename portal/templateviews.py -> views/loginrequired.py
Thierry Parmentelat [Mon, 23 Sep 2013 12:24:43 +0000 (14:24 +0200)]
cleanup unused test file
Thierry Parmentelat [Mon, 23 Sep 2013 12:14:15 +0000 (14:14 +0200)]
definitely get rid of all-static
Thierry Parmentelat [Mon, 23 Sep 2013 12:10:23 +0000 (14:10 +0200)]
fix packaging
Thierry Parmentelat [Mon, 23 Sep 2013 09:37:42 +0000 (11:37 +0200)]
cleaned up unused/misplaced plugin-sample.html
Thierry Parmentelat [Mon, 23 Sep 2013 09:32:39 +0000 (11:32 +0200)]
clean up duplicates of jquery.validate.js
use standard js/ path for my_account.{register,edit_profile}.js
Thierry Parmentelat [Mon, 23 Sep 2013 09:00:07 +0000 (11:00 +0200)]
make redo
will cleanup any oldy from past conventions
Thierry Parmentelat [Mon, 23 Sep 2013 08:17:34 +0000 (10:17 +0200)]
debug statement subject to debug flag again
Thierry Parmentelat [Mon, 23 Sep 2013 07:04:16 +0000 (09:04 +0200)]
rename account_view_html.css into account_view.css
Thierry Parmentelat [Sat, 21 Sep 2013 07:26:52 +0000 (09:26 +0200)]
minor tweaks
Thierry Parmentelat [Sat, 21 Sep 2013 06:58:11 +0000 (08:58 +0200)]
now that make static runs collectstatic we need django at build-time
Thierry Parmentelat [Sat, 21 Sep 2013 06:15:12 +0000 (08:15 +0200)]
markerclusterer follows same versionsing scheme as other third party pieces
Thierry Parmentelat [Fri, 20 Sep 2013 14:40:52 +0000 (16:40 +0200)]
separate templates from static files
we're now rather consistent with django mainstream's default layout
even if it's not always very convenient (use symlinks in your workdir)
Thierry Parmentelat [Fri, 20 Sep 2013 10:18:34 +0000 (12:18 +0200)]
Setting tag myslice-0.2-3
checkpoint for deployment on test.myslice.info
Thierry Parmentelat [Thu, 19 Sep 2013 19:49:58 +0000 (21:49 +0200)]
rename into unfold/*collect*static.py
check .gitignore for new layout conventions
Thierry Parmentelat [Thu, 19 Sep 2013 17:18:43 +0000 (19:18 +0200)]
Merge branch 'master' of ssh://git.onelab.eu/git/myslice
Thierry Parmentelat [Thu, 19 Sep 2013 17:17:39 +0000 (19:17 +0200)]
typo in comment
Yasin [Thu, 19 Sep 2013 16:01:55 +0000 (18:01 +0200)]
MyAccount: minor cosmetic changes
Thierry Parmentelat [Thu, 19 Sep 2013 14:35:03 +0000 (16:35 +0200)]
Merge branch 'master' of ssh://git.onelab.eu/git/myslice
Thierry Parmentelat [Thu, 19 Sep 2013 14:33:54 +0000 (16:33 +0200)]
rename django-static/ into the standard plain static/
remove the urls.py-defined static/ redirection that is not needed
completely drop the old make-based all-static/ business
updated README and server-loop.sh
Yasin [Thu, 19 Sep 2013 14:09:45 +0000 (16:09 +0200)]
MyAccount:Trade off msg added
Yasin [Thu, 19 Sep 2013 13:49:54 +0000 (15:49 +0200)]
MyAccount:Redirecting to same page with success/error message. Thanks to Django Messages framework
Jordan Augé [Thu, 19 Sep 2013 12:40:59 +0000 (14:40 +0200)]
Merge branch 'master' of ssh://git.onelab.eu/git/myslice
Jordan Augé [Thu, 19 Sep 2013 12:40:33 +0000 (14:40 +0200)]
fixed static file collection for third party components: now relying on symlinks
Yasin [Thu, 19 Sep 2013 12:40:10 +0000 (14:40 +0200)]
Reg: Hint msg updated
Yasin [Thu, 19 Sep 2013 12:30:33 +0000 (14:30 +0200)]
Merge branch 'master' of ssh://git.onelab.eu/git/myslice
Yasin [Thu, 19 Sep 2013 12:30:30 +0000 (14:30 +0200)]
Reg:Warning Msg added, MyAccount: delete,download in progess. Css: common css moved to onelab.css
Thierry Parmentelat [Thu, 19 Sep 2013 10:59:58 +0000 (12:59 +0200)]
review slice layout for resources - the 'customize resources layout' area only makes sense when looking at the list view
Thierry Parmentelat [Thu, 19 Sep 2013 10:20:06 +0000 (12:20 +0200)]
reworked googlemap
* one marker per site; infowindow then has a list of checkboxed resource hrn's
* seems to play fine with related hazelnut (resources as a list) and resourcesselected (pending operations) for adding / removing stuff all ways through
known bugs
* right hand side zoom-control area still all munched
probably needs more extensive testing for cases where the map is hidden or does not have focus
Thierry Parmentelat [Wed, 18 Sep 2013 19:12:17 +0000 (21:12 +0200)]
exception handling shows the error
Yasin [Wed, 18 Sep 2013 13:40:17 +0000 (15:40 +0200)]
MyAccount: Generate keys+Upload keys Ok [users needs to have account on myslice to do that], CSS improved. actions.py: update account function fixed.
Yasin [Tue, 17 Sep 2013 13:21:52 +0000 (15:21 +0200)]
Merge branch 'master' of ssh://git.onelab.eu/git/myslice
Yasin [Tue, 17 Sep 2013 13:21:48 +0000 (15:21 +0200)]
BugFix: MyAccount: Edit name is now possible if there was no entry previously
Thierry Parmentelat [Tue, 17 Sep 2013 09:56:30 +0000 (11:56 +0200)]
rename googlemaps into googlemap
Thierry Parmentelat [Tue, 17 Sep 2013 09:42:44 +0000 (11:42 +0200)]
imported latest release of markercluster from google
Thierry Parmentelat [Tue, 17 Sep 2013 08:58:12 +0000 (10:58 +0200)]
smoother handling of when backend cannot be reached at all
Thierry Parmentelat [Mon, 16 Sep 2013 13:13:08 +0000 (15:13 +0200)]
again: so we have el-> elmt and els -> elts
Thierry Parmentelat [Mon, 16 Sep 2013 13:07:18 +0000 (15:07 +0200)]
global helper functions need to have grep-able names, i.e. a little bit longer
Thierry Parmentelat [Mon, 16 Sep 2013 12:50:50 +0000 (14:50 +0200)]
pretty printed