summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--content/fireflix-panel.xul29
-rw-r--r--content/fireflix.css4
-rw-r--r--locale/en-US/fireflix.dtd4
3 files changed, 22 insertions, 15 deletions
diff --git a/content/fireflix-panel.xul b/content/fireflix-panel.xul
index b961edb..2356c82 100644
--- a/content/fireflix-panel.xul
+++ b/content/fireflix-panel.xul
@@ -81,91 +81,94 @@
81 oncommand="fireflix.uploads.on_upload()" /> 81 oncommand="fireflix.uploads.on_upload()" />
82 <command id="cmd_uploads_remove" label="&panel.uploads.remove.label;" 82 <command id="cmd_uploads_remove" label="&panel.uploads.remove.label;"
83 oncommand="fireflix.uploads.on_remove()" /> 83 oncommand="fireflix.uploads.on_remove()" />
84 <command id="cmd_uploads_add" label="&panel.uploads.add.label;" 84 <command id="cmd_uploads_add" label="&panel.uploads.add.label;"
85 oncommand="fireflix.uploads.on_add()" /> 85 oncommand="fireflix.uploads.on_add()" />
86 </commandset> 86 </commandset>
87 87
88 <popupset> 88 <popupset>
89 <popup id="uploads_menu"> 89 <popup id="uploads_menu">
90 <menuitem command="cmd_uploads_add"/> 90 <menuitem command="cmd_uploads_add"/>
91 <menuitem command="cmd_uploads_clear"/> 91 <menuitem command="cmd_uploads_clear"/>
92 <menuitem command="cmd_uploads_remove"/> 92 <menuitem command="cmd_uploads_remove"/>
93 <menuseparator/> 93 <menuseparator/>
94 <menuitem command="cmd_uploads_upload"/> 94 <menuitem command="cmd_uploads_upload"/>
95 <menuseparator/> 95 <menuseparator/>
96 <menu label="&panel.uploads.generate_html;" id="uploads_html_menu"/> 96 <menu label="&panel.uploads.generate_html;" id="uploads_html_menu"/>
97 </popup> 97 </popup>
98 </popupset> 98 </popupset>
99 99
100 <vbox class="wholething" flex="1"> 100 <vbox class="wholething" flex="1">
101 101
102 <groupbox context="auth_menu"> 102 <groupbox context="auth_menu">
103 <caption label="&panel.auth_info;"/> 103 <caption label="&panel.auth_info;"/>
104 <hbox> 104 <hbox>
105 <label id="auth_info" value="&panel.no_auth_info;" flex="1" disabled="true" crop="end"/> 105 <vbox pack="center" flex="1">
106 <button id="b_auth" command="cmd_auth_auth"/> 106 <label id="auth_info" value="&panel.no_auth_info;" disabled="true" crop="end"/>
107 <button id="b_auth_done" command="cmd_auth_done" hidden="true"/> 107 </vbox>
108 <button command="cmd_auth_open_flickr" 108 <button class="lean" id="b_auth" command="cmd_auth_auth"/>
109 <button class="lean" id="b_auth_done" command="cmd_auth_done" hidden="true"/>
110 <button class="lean" command="cmd_auth_open_flickr"
109 tooltiptext="&panel.auth.flickr.tip;"/> 111 tooltiptext="&panel.auth.flickr.tip;"/>
110 <button command="cmd_help"/> 112 <button class="lean" command="cmd_help"/>
111 </hbox> 113 </hbox>
112 </groupbox> 114 </groupbox>
113 115
114 <tabbox flex="1" id="fireflix_tabs"> 116 <tabbox flex="1" id="fireflix_tabs">
115 117
116 <tabs> 118 <tabs>
117 <tab label="&panel.tabs.search;"/> 119 <tab label="&panel.tabs.search;"/>
118 <tab label="&panel.tabs.sets;"/> 120 <tab label="&panel.tabs.sets;"/>
119 <tab label="&panel.tabs.tags;" hidden="true"/> <!-- TODO: --> 121 <tab label="&panel.tabs.tags;" hidden="true"/> <!-- TODO: -->
120 <tab id="tab_upload" label="&panel.tabs.upload;"/> 122 <tab id="tab_upload" label="&panel.tabs.upload;"/>
121 </tabs> 123 </tabs>
122 124
123 <tabpanels flex="1"> 125 <tabpanels flex="1">
124 126
125 <tabpanel id="tabpanel_search" flex="1"> 127 <tabpanel id="tabpanel_search" flex="1">
126 <vbox flex="1"> 128 <vbox flex="1">
127 <groupbox class="search_params" orient="vertical" onkeypress="if(event.keyCode==event.DOM_VK_RETURN) fireflix.foundphotos.search_photos()"> 129 <groupbox class="search_params" orient="vertical" onkeypress="if(event.keyCode==event.DOM_VK_RETURN) fireflix.foundphotos.search_photos()">
128 <hbox> 130 <hbox>
129 <label control="search_for" value="&panel.search.search_for.label;" 131 <vbox pack="center">
130 accesskey="s"/> 132 <label control="search_for" value="&panel.search.search_for.label;" accesskey="s"/>
133 </vbox>
131 <textbox id="search_for" flex="1"/> 134 <textbox id="search_for" flex="1"/>
132 </hbox> 135 </hbox>
133 <hbox> 136 <hbox>
134 <checkbox id="search_tags" label="&panel.search.mode.tagsonly.label;" 137 <checkbox id="search_tags" label="&panel.search.mode.tagsonly.label;"
135 tooltiptext="&panel.search.mode.tagsonly.tip;" checked="false" 138 tooltiptext="&panel.search.mode.tagsonly.tip;" checked="false"
136 accesskey="t" /> 139 accesskey="t" />
137 <checkbox id="search_mine" label="&panel.search.mode.mine.label;" checked="true" accesskey="m"/> 140 <checkbox id="search_mine" label="&panel.search.mode.mine.label;" checked="true" accesskey="m"/>
138 <spacer flex="1"/> 141 <spacer flex="1"/>
139 <button command="cmd_search"/> 142 <button class="lean" command="cmd_search"/>
140 </hbox> 143 </hbox>
141 </groupbox> 144 </groupbox>
142 <hbox> 145 <hbox>
143 <button command="cmd_search_prev_page"/> 146 <button class="lean" command="cmd_search_prev_page"/>
144 <spacer flex="1"/> 147 <spacer flex="1"/>
145 <label id="search_page" hidden="true"/> 148 <label id="search_page" hidden="true"/>
146 <spacer flex="1"/> 149 <spacer flex="1"/>
147 <button command="cmd_search_next_page"/> 150 <button class="lean" command="cmd_search_next_page"/>
148 </hbox> 151 </hbox>
149 <tree id="searchresults" rows="2" flex="1" 152 <tree id="searchresults" rows="2" flex="1"
150 onselect="fireflix.foundphotos.on_select()" 153 onselect="fireflix.foundphotos.on_select()"
151 ondblclick="fireflix.foundphotos.on_cmd_open(event)" 154 ondblclick="fireflix.foundphotos.on_cmd_open(event)"
152 onkeypress="if(event.keyCode==event.DOM_VK_RETURN) 155 onkeypress="if(event.keyCode==event.DOM_VK_RETURN)
153 fireflix.foundphotos.on_cmd_open(event)"> 156 fireflix.foundphotos.on_cmd_open(event)">
154 <treecols> 157 <treecols>
155 <treecol id="sr_title" label="&panel.search.col.title.label;" flex="2" crop="end" align="start" /> 158 <treecol id="sr_title" label="&panel.search.col.title.label;" flex="2" crop="end" align="start" />
156 </treecols> 159 </treecols>
157 <treechildren/> 160 <treechildren/>
158 </tree> 161 </tree>
159 <groupbox id="searchresult_props" orient="horizontal" hidden="true"> 162 <groupbox id="searchresult_props" orient="horizontal" hidden="true">
160 <vbox width="100" pack="center"> 163 <vbox width="100" pack="center">
161 <hbox pack="center"> 164 <hbox pack="center">
162 <image id="search_photo" 165 <image id="search_photo"
163 ondblclick="fireflix.foundphotos.on_cmd_open(event)"/> 166 ondblclick="fireflix.foundphotos.on_cmd_open(event)"/>
164 </hbox> 167 </hbox>
165 </vbox> 168 </vbox>
166 <vbox flex="1"> 169 <vbox flex="1">
167 <label id="searchresult_title" crop="end"/> 170 <label id="searchresult_title" crop="end"/>
168 <hbox flex="1" pack="center"> 171 <hbox flex="1" pack="center">
169 <div flex="1" id="searchresult_description" xmlns="http://www.w3.org/1999/xhtml"/> 172 <div flex="1" id="searchresult_description" xmlns="http://www.w3.org/1999/xhtml"/>
170 </hbox> 173 </hbox>
171 <hbox pack="end"> 174 <hbox pack="end">
@@ -249,43 +252,43 @@
249 <column flex="1"/> 252 <column flex="1"/>
250 </columns> 253 </columns>
251 <rows> 254 <rows>
252 <row> 255 <row>
253 <label control="upload_filename" 256 <label control="upload_filename"
254 value="&panel.upload_props.filename.label;" /> 257 value="&panel.upload_props.filename.label;" />
255 <textbox id="upload_filename" 258 <textbox id="upload_filename"
256 oninput="fireflix.uploads.propsToSel('filename')"/> 259 oninput="fireflix.uploads.propsToSel('filename')"/>
257 </row> 260 </row>
258 <row> 261 <row>
259 <label control="upload_title" value="&panel.upload_props.title.label;" /> 262 <label control="upload_title" value="&panel.upload_props.title.label;" />
260 <textbox id="upload_title" 263 <textbox id="upload_title"
261 oninput="fireflix.uploads.propsToSel('title')"/> 264 oninput="fireflix.uploads.propsToSel('title')"/>
262 </row> 265 </row>
263 <row> 266 <row>
264 <label control="uplod_tags" value="&panel.upload_props.tags.label;" /> 267 <label control="uplod_tags" value="&panel.upload_props.tags.label;" />
265 <textbox id="upload_tags" 268 <textbox id="upload_tags"
266 oninput="fireflix.uploads.propsToSel('tags')"/> 269 oninput="fireflix.uploads.propsToSel('tags')"/>
267 </row> 270 </row>
268 <!-- TODO: description, public, friend, family --> 271 <!-- TODO: description, public, friend, family -->
269 </rows> 272 </rows>
270 </grid> 273 </grid>
271 </groupbox> 274 </groupbox>
272 <hbox> 275 <hbox>
273 <button command="cmd_uploads_add" /> 276 <button class="lean" command="cmd_uploads_add" />
274 <spacer flex="1"/> 277 <spacer flex="1"/>
275 <button command="cmd_uploads_remove" /> 278 <button class="lean" command="cmd_uploads_remove" />
276 <spacer flex="1"/> 279 <spacer flex="1"/>
277 <button command="cmd_uploads_clear" /> 280 <button class="lean" command="cmd_uploads_clear" />
278 </hbox> 281 </hbox>
279 <hbox pack="center"> 282 <hbox pack="center">
280 <button command="cmd_uploads_upload" flex="1"/> 283 <button command="cmd_uploads_upload" flex="1"/>
281 </hbox> 284 </hbox>
282 </vbox> 285 </vbox>
283 </tabpanel> 286 </tabpanel>
284 287
285 </tabpanels> 288 </tabpanels>
286 289
287 </tabbox> 290 </tabbox>
288 291
289 </vbox> 292 </vbox>
290 293
291</page> 294</page>
diff --git a/content/fireflix.css b/content/fireflix.css
index 47455f6..4fba5d3 100644
--- a/content/fireflix.css
+++ b/content/fireflix.css
@@ -99,24 +99,28 @@ label#search_page {
99} 99}
100 100
101html body { 101html body {
102 font-family: arial, sans-serif; 102 font-family: arial, sans-serif;
103 font-size: 11pt; 103 font-size: 11pt;
104 margin: 1em 4em; 104 margin: 1em 4em;
105 padding: 1em 4em; 105 padding: 1em 4em;
106 border: double 3px gray; 106 border: double 3px gray;
107 background: #ffffc0; 107 background: #ffffc0;
108} 108}
109html h1 { 109html h1 {
110 font-size: 130%; color: maroon; 110 font-size: 130%; color: maroon;
111} 111}
112html p { 112html p {
113 text-align: justify; 113 text-align: justify;
114} 114}
115 115
116html div.copyright { 116html div.copyright {
117 font-size: 60%; 117 font-size: 60%;
118 text-align: right; 118 text-align: right;
119} 119}
120html div.copyright a { 120html div.copyright a {
121 text-decoration: none; 121 text-decoration: none;
122} 122}
123
124button.lean {
125 min-width: 1ex;
126}
diff --git a/locale/en-US/fireflix.dtd b/locale/en-US/fireflix.dtd
index 88ec6fb..0e158c3 100644
--- a/locale/en-US/fireflix.dtd
+++ b/locale/en-US/fireflix.dtd
@@ -14,50 +14,50 @@
14 14
15<!-- Sidebar --> 15<!-- Sidebar -->
16 16
17<!ENTITY panel.auth_info "Authorization info"> 17<!ENTITY panel.auth_info "Authorization info">
18<!ENTITY panel.no_auth_info "No auth info available"> 18<!ENTITY panel.no_auth_info "No auth info available">
19 19
20<!ENTITY panel.auth.auth.label "Authorize"> 20<!ENTITY panel.auth.auth.label "Authorize">
21<!ENTITY panel.auth.done.label "Authorization complete"> 21<!ENTITY panel.auth.done.label "Authorization complete">
22<!ENTITY panel.auth.flickr.label "Flickr"> 22<!ENTITY panel.auth.flickr.label "Flickr">
23<!ENTITY panel.auth.flickr.tip "Open Flickr in new tab"> 23<!ENTITY panel.auth.flickr.tip "Open Flickr in new tab">
24<!ENTITY panel.auth.unauth.label "Sign off"> 24<!ENTITY panel.auth.unauth.label "Sign off">
25 25
26<!ENTITY panel.tabs.search "Search" > 26<!ENTITY panel.tabs.search "Search" >
27<!ENTITY panel.tabs.sets "Sets" > 27<!ENTITY panel.tabs.sets "Sets" >
28<!ENTITY panel.tabs.tags "Tags" > 28<!ENTITY panel.tabs.tags "Tags" >
29<!ENTITY panel.tabs.upload "Upload" > 29<!ENTITY panel.tabs.upload "Upload" >
30 30
31<!ENTITY panel.search.cmd_search.label "Search" > 31<!ENTITY panel.search.cmd_search.label "Search" >
32<!ENTITY panel.search.search_for.label "Search for:" > 32<!ENTITY panel.search.search_for.label "Search for:" >
33<!ENTITY panel.search.mode.tagsonly.label "tags"> 33<!ENTITY panel.search.mode.tagsonly.label "tags">
34<!ENTITY panel.search.mode.tagsonly.tip "Search tags only"> 34<!ENTITY panel.search.mode.tagsonly.tip "Search tags only">
35<!ENTITY panel.search.mode.mine.label "mine"> 35<!ENTITY panel.search.mode.mine.label "mine">
36<!ENTITY panel.search.col.title.label "Title"> 36<!ENTITY panel.search.col.title.label "Title">
37<!ENTITY panel.search.cmd_search_open.label "Open"> 37<!ENTITY panel.search.cmd_search_open.label "Open">
38<!ENTITY panel.search.cmd_search_prev_page.label "«"> 38<!ENTITY panel.search.cmd_search_prev_page.label " « ">
39<!ENTITY panel.search.cmd_search_next_page.label "»"> 39<!ENTITY panel.search.cmd_search_next_page.label " » ">
40 40
41<!ENTITY panel.sets.name.label "Set"> 41<!ENTITY panel.sets.name.label "Set">
42<!ENTITY panel.sets.name.tip "Photoset name"> 42<!ENTITY panel.sets.name.tip "Photoset name">
43<!ENTITY panel.sets.photos.label "Photos"> 43<!ENTITY panel.sets.photos.label "Photos">
44<!ENTITY panel.sets.photos.tip "Number of photos in set"> 44<!ENTITY panel.sets.photos.tip "Number of photos in set">
45 45
46<!ENTITY panel.sets.cmd_refresh_sets "Refresh"> 46<!ENTITY panel.sets.cmd_refresh_sets "Refresh">
47<!ENTITY panel.sets.cmd_properties "Properties"> 47<!ENTITY panel.sets.cmd_properties "Properties">
48 48
49<!ENTITY panel.sets.generate_html "Generate HTML"> 49<!ENTITY panel.sets.generate_html "Generate HTML">
50 50
51<!ENTITY panel.setphotos.title.label "Title"> 51<!ENTITY panel.setphotos.title.label "Title">
52<!ENTITY panel.setphotos.title.tip "Picture title"> 52<!ENTITY panel.setphotos.title.tip "Picture title">
53<!ENTITY panel.setphotos.taken.label "Taken"> 53<!ENTITY panel.setphotos.taken.label "Taken">
54<!ENTITY panel.setphotos.taken.tip "When the picture was taken"> 54<!ENTITY panel.setphotos.taken.tip "When the picture was taken">
55<!ENTITY panel.setphotos.upload.label "Uploaded"> 55<!ENTITY panel.setphotos.upload.label "Uploaded">
56<!ENTITY panel.setphotos.upload.tip "When the picure was uploaded"> 56<!ENTITY panel.setphotos.upload.tip "When the picure was uploaded">
57 57
58<!ENTITY panel.tagslist.tag.label "Tag"> 58<!ENTITY panel.tagslist.tag.label "Tag">
59 59
60<!ENTITY panel.uploadlist.file.label "File name"> 60<!ENTITY panel.uploadlist.file.label "File name">
61<!ENTITY panel.uploadlist.title.label "Title"> 61<!ENTITY panel.uploadlist.title.label "Title">
62<!ENTITY panel.uploadlist.status.label "Status"> 62<!ENTITY panel.uploadlist.status.label "Status">
63 63