Commit graph

427 commits

Author SHA1 Message Date
572349c1f1 Show the child / photo count on the tooltip as well. 2019-03-16 13:07:29 -07:00
1b5770b81a Somewhat improve appearance of album cards on narrow screens.
Previously, on very narrow screens, the album cards were spilling
out of the container. Now they are better contained but I am
still not 100% satisfied with the margins between them.
2019-03-16 13:07:00 -07:00
cc98def9fb Remove margin-bottom from last child of #left. 2019-03-16 12:24:50 -07:00
59901cb344 Give #left a right margin instead of 95% width & centering. 2019-03-16 12:24:19 -07:00
9b72b3dff0 Use CSS Grid on photo.html, resolve some Chrome/FF differences.
- In Firefox, the image under flex would be full-res height
  instead of staying screen height.
  In this new Grid-based layout the image is the correct size.
  Left toolbox still uses flex, no problems with it.
- Redid the classing of the photo_viewer and eliminated
  photo_img_holder so that all media types follow the same markup.
- Added a CSS variable for tracking narrow mode instead of relying
  on coincidental properties like flex settings.
2019-01-16 19:22:21 -08:00
b864397242 Have bookmark editor show errors on non 200 responses. 2019-01-13 15:05:03 -08:00
a0faec9639 Have album editor show errors on non 200 responses. 2019-01-13 14:44:21 -08:00
c8f7239e19 Remove unnecessary margin-top from #left elements.
margin-bottom is enough to keep the space between elements,
margin-top was just adding an ugly distance from the header.
2019-01-01 17:21:44 -08:00
760ddfc6b0 Rename color_site_theme to color_theme_primary; and secondary. 2019-01-01 17:20:22 -08:00
6dcf47cab7 Remove duplicated markup between list/grid photo cards. 2018-12-27 15:30:30 -08:00
669247415f Add counts to the parent and child hierarchy headers. 2018-12-23 16:00:28 -08:00
29e999ccac Remove "children/photos" in favor of hover text.
To reduce visual clutter.
2018-12-23 15:59:50 -08:00
746d094d81 Remove duplicated markup between list/grid album cards. 2018-12-23 15:51:38 -08:00
be976d584c Tiny markup cleanup for album card. 2018-12-23 15:36:40 -08:00
3d81b5508c Oops, add data-id to the list view album card. 2018-12-23 15:28:55 -08:00
d736c81100 Minor alignments within cards. 2018-12-21 23:44:11 -08:00
1f45be9c39 Provide #right first, since #left is often slower to load. 2018-11-17 17:52:40 -08:00
dfbdaa5e99 Let specific tag name be a link. 2018-11-17 17:44:17 -08:00
59fdda6c6b Use a similar hierarchy box style as the album page. 2018-11-17 17:37:34 -08:00
e562658d42 Remove unnecessary extra indent. 2018-11-17 17:36:47 -08:00
5dcb86eed5 Rearrange some css. 2018-11-17 16:57:07 -08:00
3788c844bf Let album title editor use same font size as title itself. 2018-11-17 16:55:47 -08:00
074594a8bc Fix #right button_with_confirm from width-jumping on load.
And any other similar element.
2018-11-17 16:53:35 -08:00
e25e0798c9 Add editor button placeholder to stop page jump on load. 2018-11-17 16:50:41 -08:00
707fdcc637 Add album cards and improve album pages.
- album card has placeholder for future thumbnail.
- replaced nested tree hierarchy lists with separate boxes.
- list/grid view also applies to the root listing.
- added a sticky right panel for all the tools. not pretty yet.
- mechanism for adding sticky panel changed. instead of applying
  it to the #right, you apply it to #content_body so that its
  grid layout can be updated properly.
2018-11-12 22:15:59 -08:00
e7d3a652a7 Change largest limit option to 200.
Accidentally commited the number 250 on search.html earlier. Oops.
Anyway I was finding 100 too limiting sometimes.
I will think about making this configurable eventually.
2018-11-04 18:38:32 -08:00
dcfa7a862d Variety of html, css, jinja tweaks. 2018-11-04 18:36:17 -08:00
98d5374d17 Add CSS class sticky_side_right. 2018-11-04 18:32:55 -08:00
588bf59b88 Variety of html, css, jinja tweaks.
- common.css, removed html and body margins so that using
  full height #content_body will not create a scrollbar.
  Simplifies the "fill remaining space" construct I use a lot.
  Added more css variables, I'm thinking about future theming.
- photo_card.css, slightly heightened to improve name clipping.
- clipboard.html, added a small screen mode.
- login.html, centered the boxes and fixed message area being
  too small due to a previous change.
- search.html, simplified some conditional texts.
2018-10-21 18:46:27 -07:00
70d0e64309 Add a CSS class to photo cards for selection state.
Planning on adding some rules to make selected cards
stand out in some way, or at least have that possibility.
2018-10-20 02:32:33 -07:00
f9b3f8b0f4 Oops, add missing parentheses to album paste/unpaste buttons. 2018-10-20 02:27:15 -07:00
0ea9f19592 Import api.js into the rest of the pages.
Now we can do anything from anywhere!
2018-09-23 16:53:49 -07:00
d436b32df8 Integrate users with api.js. 2018-09-23 16:50:27 -07:00
8cfa88e45d Integrate tags with api.js and improve sanity of tag endpoints. 2018-09-23 16:41:34 -07:00
af318414e2 Integrate photos with api.js. 2018-09-23 15:52:19 -07:00
bbd4fbd77f Integrate bookmarks with api.js. 2018-09-23 15:43:42 -07:00
3a9ab2b099 Rename photoclipboard.js -> photo_clipboard.js.
To match the namespace photo_clipboard.
2018-09-23 15:17:31 -07:00
616c490391 Merge albums.html and album.html, remove album.js.
The markup for the album listing page and individual album page
were different enough that I decided to make them wholly separate,
but then this left the shared javascript in its own stupid file
unlike any of the other types.
So, I'm merging them as a huge jinja if-else, which is also dumb
but it feels better than all these separate files.
2018-09-23 15:13:31 -07:00
ac79183603 Use more CSS grid on body and content_body.
I learned that grid-template lets you specify row and col
sizes all at once.
2018-09-23 15:08:39 -07:00
20e41ad689 Extremely minor touchups. 2018-09-23 14:57:25 -07:00
3db5c77c2c Use a CSS var for 10% transparency and drop shadow. 2018-09-22 16:01:34 -07:00
2c48b43b71 Use a CSS variable for the secondary theme color. 2018-09-22 01:14:50 -07:00
01a8a6df66 Oops, don't go checking the textbox for tag removal. 2018-09-21 21:32:19 -07:00
f397140e20 Make /logout operate on POST only. 2018-08-17 22:23:40 -07:00
8fdbd49f70 Minor html and style fixes.
Applied wrapping to the description <pre>s,
removed some css that referred to nonexistent things,
move some element tags inside the {%if%} that fills the contents.
2018-08-17 22:05:16 -07:00
251bc04459 Fix photo.html endpoint urls. 2018-08-16 19:45:47 -07:00
1fcacb81fc Update clipboard.html's button function naming scheme like others.
I have finally found a pattern I like which is
function, function_callback, and function_form
for the backend, callback, and button handler respectively.
2018-08-14 23:24:12 -07:00
bea9f905bd Support downloading .zip of arbitrary photos, clipboard.
Now that creating zips of any photo set is easier, we can
let the user download whatever is on their clipboard.
2018-08-14 23:02:06 -07:00
f047235c48 Reorganize a bunch of javascript handlers.
The javascript is very inconsistent between pages. I'm trying to
start using a consistent pattern where the api call is kept in a
separate function from the ones that buttons and input boxes
talk to.
2018-07-29 01:25:53 -07:00
b314d6376f Update the hrefs when saving the bookmark editor. 2018-07-29 00:43:12 -07:00
fd23b563cf Implement bookmark delete on frontend. 2018-07-29 00:36:50 -07:00
8447fb3343 Make deleting and unlinking tags require confirmation.
Added text inside the delete buttons and made them confirm.
2018-07-28 20:25:25 -07:00
949f7177de Add css class gray_button, for more neutral / cancel actions.
Red seems too aggressive and indicates danger when not appropriate.
Gray seems better for reverting to an already safe state.
2018-07-28 20:18:10 -07:00
22d2efa289 Add 'event' to toggle_hoverzoom header for firefox's benefit. 2018-07-28 16:16:16 -07:00
dfff79baa7 Oops, fix broken clipboard reference due to namespace change. 2018-07-28 16:15:15 -07:00
9c354249c9 Rename variable editor -> ed to avoid conflicting with the module.
Even in cases that were not causing problems, for consistency.
2018-07-28 15:17:18 -07:00
977b47522d Add autocomplete to /clipboard. 2018-07-22 20:45:16 -07:00
c840845c7d Add namespacing to albums.js. 2018-07-22 20:21:00 -07:00
63a3ecfa88 Add namespacing to editor.js. 2018-07-22 20:21:00 -07:00
d7b9020585 Add namespacing to photoclipboard.js. 2018-07-22 20:21:00 -07:00
c7cce5a4e5 Add namespacing to common.js. 2018-07-22 20:21:00 -07:00
cf9b6d0725 Workaround autocomplete box sticking around after submitting. 2018-07-22 20:20:54 -07:00
5ec38a93b1 On the tag ancestors, don't display the current tag name.
I was finding it too confusing.
2018-07-22 20:19:05 -07:00
8a12a24e8e Add tag_autocomplete.js.
Instead of embedding the entire tag list in the search.html template
every single time, this script loads the tags from the new,
cache-enabled endpoint /all_tags.json. Then we can use html5
datalists to create autocomplete forms on the search and photo pages.
2018-07-22 20:19:05 -07:00
4c65ccaf68 Big! Liberate Groupables from strict heirarchy. Multiple parents.
I found that the strict heirarchy was not satisfying the situation
where one tag is the intersection of two others, but we can only
pick one as the parent

For example, does red_jacket belong under clothes.red_clothes or
clothes.jackets? A search for "red_clothes AND jackets" might
give us someone wearing red pants and a black jacket, so this
definitely needs to be a separate tag, but picking only one
parent for it is not sufficient. Now, a search for red_clothes
and a search for jackets will both find our red_jacket photo.

The change also applies to Albums because why not, and I'm sure
a similar case can be made.

Unfortunately this means tags no longer have one true qualname.
The concept of qualnames has not been completely phased out but
it's in progress.

This commit is very big because I was not sure for a long time
whether to go through with it, and so much stuff had to change
that I don't want to go back and figure out what could be grouped
together.
2018-07-20 13:09:06 -07:00
5c97086df3 Improve hotkey framework by making own file & register function. 2018-07-14 14:19:13 -07:00
984f6eb3c7 Add a clear button to the clipboard tray. 2018-07-14 02:49:45 -07:00
4002cc660e Don't use shortlink for zoom url. It breaks caching. 2018-05-01 21:03:10 -07:00
b19682d1a5 Replace Photo.sorted_tags with jinja filter. 2018-04-28 19:05:51 -07:00
50592f0ab4 Rework tab titles from "Album X" to "X | Albums" etc.
To prioritize the most unique and relevant piece of information.
2018-04-27 20:04:24 -07:00
bdec6cf4a3 Add filter to generate /file/ link with appropriate basename.
Because inlining the |urlencode every time is easy to forget.
2018-04-19 19:29:06 -07:00
21bd211889 Give Users a display_name. 2018-04-15 14:23:24 -07:00
df211454bb Include username and password length requirements on form. 2018-04-15 13:20:08 -07:00
f77ab51b14 Add Album.has_any_photo and has_any_subalbum_photo. 2018-04-15 02:41:24 -07:00
c1fd863999 Add jinja_filters.py with bytestring. 2018-04-15 00:59:54 -07:00
4fcb524211 Show number of photos in h3 on Album page 2018-04-06 21:50:13 -07:00
6ee86431e5 Add Album.normalize_title and _description. 2018-03-23 00:35:55 -07:00
0e3ae11610 Improve normalizers, use less None; Add author search box.
It was getting difficult to remember which of the normalizers
use None and which don't. So let's try to be a little more consistent
and just use empty sets, etc, so the caller can rely on receiving a
set instead of having to check for None.

Also renamed search parameter authors->author to be more in line
with the singular form of extension.
2018-03-22 21:09:21 -07:00
7b4ae3045a Remove some excessive newlines from photo_card output. 2018-03-19 22:52:15 -07:00
b4cd4b6130 Fix body not filling vertical space. 2018-03-19 15:06:07 -07:00
45bd80caa4 Remove height:40px from plain_link. Only nice_link. 2018-03-19 15:03:53 -07:00
b90971813f Oops, fix broken click-to-join because of the qualname change. 2018-03-19 14:11:25 -07:00
a5aef63c6f Tags on this page should also display qualnames with maxlen. 2018-03-18 19:47:08 -07:00
4a39b527f3 Use dot_extension on the photo cards. 2018-03-18 00:19:30 -07:00
8fcaf15fbe Remove the word "Album" from the h2. The number is okay.
I just decided I like this better.
2018-03-10 19:54:56 -08:00
df86d0f128 Replace "you are here" with the album's name. 2018-03-10 19:54:22 -08:00
45091c6596 Fix thumbnail height in CSS only, no html attr. Don't h-stretch. 2018-03-10 19:53:29 -08:00
f04e055ca3 On the tag page, put descr in a dark box like albums. 2018-03-10 13:40:02 -08:00
daf824caf5 Improve album page's use of data-editor-empty-text. 2018-03-10 13:24:23 -08:00
f9bee5716c Don't clear the clipboard after pasting into album.
Sometimes I want to do more operations.
2018-03-09 17:50:41 -08:00
a1919a7725 Support giving title when creating albums. Two-step prompt. 2018-03-09 17:38:40 -08:00
5f6d21fdee Give Photos a searchhidden property.
By default, photos with searchhidden do not appear in the search
results. This allows a small number of representative images from
a large album to appear in the results, while the rest can be
found on the album's page.

The same effect could be achieved with a tag and forbid search,
but tag searching has much higher cost and it would be more difficult
to implement as a default behavior without requiring lots of special
checks whenever listing tags etc.
2018-03-09 17:10:27 -08:00
faacf7b594 Oops, use response["data"]. 2018-02-26 19:06:27 -08:00
f34164bf85 Add search feature has_thumbnails.
Search needs a complete refactor.
But until then, let's keep adding to it!
2018-02-24 23:06:25 -08:00
5f7266c519 Add button to clear clipboard. 2018-02-24 23:00:28 -08:00
2fceeedbbb Add /clipboard UI for mass refresh metadata. 2018-02-24 13:23:35 -08:00
30c9148092 Move the remaining common css / js to their folders. 2018-02-24 12:51:36 -08:00
79b20369db Oops, apply listeners to /photo input box as well. 2018-02-24 01:08:21 -08:00
e359180467 Move clipboard_tray rules to own file in css folder. 2018-02-24 01:06:27 -08:00
aabcb61a9c Create css folder. Move photo_card rules to own file. 2018-02-24 00:58:43 -08:00
840185072b Move photoclipboard.js to the js folder. 2018-02-24 00:47:44 -08:00
56a998682d Create js folder. Move Editor to its own file. 2018-02-24 00:46:55 -08:00
aa284c388d Fix message_area on /login.
Because the rules are no longer in common.
2018-02-24 00:34:46 -08:00
9c6cae7177 Use event listeners instead of setting onkeyup manually. 2018-02-24 00:24:38 -08:00
5a1d259780 Add /clipboard UI for mass-tagging. 2018-02-22 15:23:57 -08:00
2adadf9871 Rewrite tags.html with more Grid. 2018-02-21 22:13:46 -08:00
a9248d8cab Add CSS clipboard_size; and other clip hook improvements.
Any element with class clipboard_size will have its text updated;
Removed the call to on_pageload from save_ because it redundantly
causes a load. Separate those update hooks.
2018-02-20 20:20:20 -08:00
13e8bc4a6f Add more items to to-do list; minor fixes. 2018-02-20 16:50:39 -08:00
ebe0fcee40 Rename URL /photo_cards -> /batch/photos/photo_card. 2018-02-19 23:44:24 -08:00
6ad41eb516 Improve bookmark appearance; don't send edit with blank url. 2018-02-17 19:36:48 -08:00
91d445a877 Add new page /clipboard, with full photo cards. 2018-02-17 19:12:34 -08:00
ef5bbf5fc3 Split HTTP response dict into ["meta"] and ["data"]. 2018-02-17 18:47:17 -08:00
f4756d97e4 Improve html & Jinja indentation. 2018-02-17 18:19:47 -08:00
b4a28f5034 Make Photo.bytestring a @property.
This is the kind of thing that should be a @property, because
it's very low processing power and doesn't hit the database.
2018-02-16 23:16:02 -08:00
bbe392ac09 Rename Photo.author -> get_author; no longer a @property. 2018-02-16 23:11:25 -08:00
205c49c21f Rename Photo.albums -> get_containing_albums. 2018-02-16 23:08:44 -08:00
2f9b51b636 Rename Photo.tags -> get_tags. 2018-02-16 23:07:21 -08:00
ac9d7ede22 Rename Album.photos -> get_photos. 2018-02-16 23:03:54 -08:00
6574450ad1 Rename Tag.synonyms -> get_synonyms. 2018-02-16 23:01:07 -08:00
fdcf07940a Rename Groupable.children -> get_children. 2018-02-16 23:00:43 -08:00
75effafaf5 Rename Groupable.parent -> get_parent.
After making the "if x.parent is None" mistake too many times,
forgetting that it was not a @property, I've decided that the
verby name is better.
2018-02-16 22:59:34 -08:00
1c1e7f158f Minor fixes & pylint appeasements. 2018-02-16 21:28:36 -08:00
20462f1085 Oops, add back missing CSS on mmf deleter. 2018-01-30 19:45:59 -08:00
cdd8f9e248 Only reload the page if the clip operation was successful. 2018-01-19 21:44:21 -08:00
be0fca729f Create sessions for anons as well, instead of just logged in.
It makes sense that anon sessions are still sessions. So @give_token
will ensure that every request has a session. Logged in conditionals
move from 'if session' to 'if session.user'.
2018-01-15 18:41:21 -08:00
526cc7e07d Add search form input for created. 2018-01-13 20:02:12 -08:00
5fccf5548b Add Before and After search links to the photo sidebar. 2018-01-11 16:11:38 -08:00
b89d5f77d5 Oops, add back some css classes that I missed during the rearrangement. 2017-12-20 20:11:34 -08:00
1f7247dbe1 Add paste/unpaste buttons to clipboard tray toolbox for albums. 2017-12-16 14:19:37 -08:00
e41532cff1 Rearrange some button CSS classes to be more generic.
Adds CSS variables for the highlight and shadow so they don't need
to be custom-defined for each color of button.
Elements should use more generic classes like green_button instead of
add_tag_button unless there's a good reason.
2017-12-16 14:13:02 -08:00
4a5583c091 Add tray_lines div so that tray_body might hold more buttons. 2017-12-16 12:24:46 -08:00
443d93ce18 Add the clipboard tray where users manage their photo clipboard.
Appearing on search and album pages, the tray is where you can
remove items from your clipboard without having to click on its
checkbox -- that photo card may not even be on the current page.
2017-12-16 03:47:54 -08:00
55f7da7bb2 Add the photo_clipboard feature with localStorage.
photo_card objects now have a checkbox which adds them
to the clipboard. No pasting or other operations yet.
2017-12-09 17:48:56 -08:00
156e467814 Display album hierarchy as nested bullets instead of separate lists.
Not perfect yet but I didn't like having all those header elements.
2017-11-27 16:00:52 -08:00
bdbded6467 'info' link should point to /tag/x instead of /tags/x 2017-11-26 02:49:57 -08:00
a0e0e9fbd2 Add a link to the info page for each tag. 2017-11-26 02:40:15 -08:00
b3c9dd58f5 Allow custom innertext besides just the tag's name. 2017-11-26 02:38:39 -08:00
a510c7b55c Improve Album bytes caching, start caching photo count.
More careful uncaching of the summed bytes, to minimize
recalculation. Fewer cases where the album itself
is removed from the photodb's getter cache.

This also helps the download link on album pages disappear if
the child albums don't actually have any photos.
2017-11-12 15:21:53 -08:00
26a034c9a0 Make Photo.author a @property; None if no author. 2017-09-23 10:58:04 -07:00
f9524a1858 Switch to CSS Grid for the photo cards. 2017-08-01 18:25:28 -07:00
797b3376a7 Add meta viewport to all pages. 2017-07-20 23:10:48 -07:00
0ce07b0c7b Use over-under style for #right on narrow displays. 2017-07-20 23:08:58 -07:00
463b627920 Put login / register boxes vertical when narrow. 2017-07-20 23:02:09 -07:00
f14d5fa312 Hide the description when the user saves it empty. 2017-07-16 18:23:56 -07:00
6986d56b71 Fix CSS so #left and #right don't overlap.
So that the elements in left don't go underneath right.
2017-07-16 18:20:30 -07:00
2c5617207a Add name and description editor. 2017-07-16 17:29:14 -07:00
23349e7823 Use <pre> instead of <p> so \n is kept. 2017-07-16 17:28:06 -07:00
a1178ca3a5 Focus the title editor on open. 2017-07-16 17:26:34 -07:00
61ab1fb452 Use the provided display_element_map instead of the global vars. 2017-07-13 23:32:14 -07:00
8bf33f7ac6 Nevermind, the span wasn't useless.
The h2 needs to hold the title input so it stays block-level.
2017-07-13 23:28:51 -07:00
0e17350d84 Add Editor elements for bookmarks. 2017-07-13 23:13:34 -07:00
1149283c7b Add interface for creating bookmarks. 2017-07-09 19:40:14 -07:00
9a156672b0 Remove unnecessary span. Put album title in the h2 directly. 2017-07-09 19:27:12 -07:00
2d732c5ab0 Add the tag's name into the <head> title. 2017-07-09 16:41:57 -07:00
f61570acfb Fix "tags on this page" members not superceding parents. 2017-06-19 16:27:24 -07:00
24e162c782 Add basic thumbnail for image types. 2017-06-19 16:13:42 -07:00
56655d2cd0 Fix tag_object having too much whitespace. 2017-06-16 02:22:42 -07:00
1240c1785c Fix blank_title_text not being restored upon cancel. 2017-06-14 21:56:47 -07:00
160aeb6950 Replace old work with new Editor class. 2017-06-14 21:45:20 -07:00
5ba2ecd38a Add tag_object html macro to centralize that effort. Still needs work. 2017-06-13 21:42:23 -07:00
aa30d5903d Don't clip editor_area bg when scrollbar appears.
Instead of applying the background-color to the holder, apply it to the editor
area and message area separately. Then they can flex differently so that
the editor always maintains full height, and the message area shrinks to
a minimum of 30px.
2017-06-13 21:35:13 -07:00
8a0bbbcc56 Add /bookmarks/create_bookmark endpoint. No interface yet. 2017-06-12 20:15:02 -07:00
1ad83937b4 Add 'Create Album' endpoint and interface. 2017-05-13 16:13:26 -07:00
956c55ac9a Remove unused code for add-tag-to-all of album.
I'll put it back when I actually make it work.
2017-05-13 15:52:08 -07:00
4928095abb Minor commentary and cleanup 2017-05-13 15:27:08 -07:00
eafb7fcffe Improve editor appearance and use ctrl+enter for desc. 2017-05-13 15:26:34 -07:00
95f4d79805 Move album dl link to bottom. Just feels better. 2017-05-13 15:25:31 -07:00
a4a278c173 Give Tags a description field. 2017-05-12 17:31:17 -07:00
a485be3c64 Make bitrate a real attribute instead of calculating in jinja 2017-05-11 22:34:19 -07:00
f8a78c6ee7 Minor cosmetics 2017-05-06 17:04:42 -07:00
824430dfa8 Add helper div to maintain bg color on filename hover
Without it, gaps are visible between the lines of text.
2017-05-06 04:13:33 -07:00
1fe3b99876 Move filename to be its own li 2017-05-06 03:45:01 -07:00
ae08f9919a Oops, don't forget to hide editor on cancel. 2017-05-05 23:04:33 -07:00
980688fbc1 Fix hoverzoom snapping to last known position.
Suddenly hoverzoom started acting wrongly. Possibly a Chrome update.
2017-05-05 23:02:42 -07:00
87abb055c3 Fix photo message_area from dominating screen height 2017-05-05 22:59:22 -07:00
19a9aee4fe Keep editor open until response. New Submitting... text. 2017-05-05 21:17:13 -07:00
1c30ef5785 Further separate front & back; Create frontends folder
New frontends folder will hold all front-end interfaces for etiquette. Existing flask site moved here and refers to itself as a package with external launcher. etiquette_site renamed to etiquette_flask
2017-05-01 21:49:28 -07:00