summaryrefslogtreecommitdiffabout
path: root/content
Unidiff
Diffstat (limited to 'content') (more/less context) (ignore whitespace changes)
-rw-r--r--content/Makefile.am3
-rw-r--r--content/fireflix-panel.xul3
-rw-r--r--content/fireflix.css23
-rw-r--r--content/help.xml53
4 files changed, 81 insertions, 1 deletions
diff --git a/content/Makefile.am b/content/Makefile.am
index abe3d6d..7d11964 100644
--- a/content/Makefile.am
+++ b/content/Makefile.am
@@ -1,22 +1,23 @@
1xpichromecontent_DATA = \ 1xpichromecontent_DATA = \
2 autoconf.dtd \ 2 autoconf.dtd \
3 browser.xul about.xul fireflix-panel.xul photoset-props.xul \ 3 browser.xul about.xul fireflix-panel.xul photoset-props.xul \
4 generated-content.xul copying.xul \ 4 generated-content.xul copying.xul \
5 photoset-props.js fireflix.js flickr.js util.js md5.js \ 5 photoset-props.js fireflix.js flickr.js util.js md5.js \
6 generated-content.js \ 6 generated-content.js \
7 fireflix.css \ 7 fireflix.css \
8 background.jpeg 8 background.jpeg \
9 help.xml
9 10
10sized_icons = \ 11sized_icons = \
11 $(addsuffix .png, \ 12 $(addsuffix .png, \
12 fireflix \ 13 fireflix \
13 ) 14 )
14 15
15nobase_xpichromecontent_DATA = \ 16nobase_xpichromecontent_DATA = \
16 $(addprefix icons/, \ 17 $(addprefix icons/, \
17 $(addprefix 16x16/,${sized_icons}) \ 18 $(addprefix 16x16/,${sized_icons}) \
18 $(addprefix 32x32/,${sized_icons}) \ 19 $(addprefix 32x32/,${sized_icons}) \
19 ) 20 )
20 21
21EXTRA_DIST = \ 22EXTRA_DIST = \
22 ${xpichromecontent_DATA} ${nobase_xpichromecontent_DATA} 23 ${xpichromecontent_DATA} ${nobase_xpichromecontent_DATA}
diff --git a/content/fireflix-panel.xul b/content/fireflix-panel.xul
index 1278621..b961edb 100644
--- a/content/fireflix-panel.xul
+++ b/content/fireflix-panel.xul
@@ -2,64 +2,66 @@
2<?xml-stylesheet href="chrome://global/skin/" type="text/css"?> 2<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
3<?xml-stylesheet href="fireflix.css" type="text/css"?> 3<?xml-stylesheet href="fireflix.css" type="text/css"?>
4<!DOCTYPE page SYSTEM "chrome://fireflix/locale/fireflix.dtd"> 4<!DOCTYPE page SYSTEM "chrome://fireflix/locale/fireflix.dtd">
5<page 5<page
6 xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" 6 xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
7 id="fireflixwindow" title="Fireflix" 7 id="fireflixwindow" title="Fireflix"
8 onload="fireflix.init()" 8 onload="fireflix.init()"
9 orient="vertical" 9 orient="vertical"
10 ondragover="nsDragAndDrop.dragOver(event,fireflix.uploadObserver)" 10 ondragover="nsDragAndDrop.dragOver(event,fireflix.uploadObserver)"
11 ondragdrop="nsDragAndDrop.drop(event,fireflix.uploadObserver)" 11 ondragdrop="nsDragAndDrop.drop(event,fireflix.uploadObserver)"
12 > 12 >
13 13
14 <script src="chrome://global/content/nsDragAndDrop.js"/> 14 <script src="chrome://global/content/nsDragAndDrop.js"/>
15 <script src="chrome://global/content/nsTransferable.js"/> 15 <script src="chrome://global/content/nsTransferable.js"/>
16 <script type="application/x-javascript" src="md5.js" /> 16 <script type="application/x-javascript" src="md5.js" />
17 <script type="application/x-javascript" src="util.js" /> 17 <script type="application/x-javascript" src="util.js" />
18 <script type="application/x-javascript" src="flickr.js" /> 18 <script type="application/x-javascript" src="flickr.js" />
19 <script type="application/x-javascript" src="fireflix.js" /> 19 <script type="application/x-javascript" src="fireflix.js" />
20 20
21 <stringbundleset> 21 <stringbundleset>
22 <stringbundle id="loc_strings" src="chrome://fireflix/locale/fireflix.properties" /> 22 <stringbundle id="loc_strings" src="chrome://fireflix/locale/fireflix.properties" />
23 </stringbundleset> 23 </stringbundleset>
24 24
25 <commandset> 25 <commandset>
26 <command id="cmd_auth_auth" label="&panel.auth.auth.label;" 26 <command id="cmd_auth_auth" label="&panel.auth.auth.label;"
27 oncommand="fireflix.on_cmd_auth()"/> 27 oncommand="fireflix.on_cmd_auth()"/>
28 <command id="cmd_auth_done" label="&panel.auth.done.label;" 28 <command id="cmd_auth_done" label="&panel.auth.done.label;"
29 oncommand="fireflix.on_cmd_auth_done()" disabled="true"/> 29 oncommand="fireflix.on_cmd_auth_done()" disabled="true"/>
30 <command id="cmd_auth_open_flickr" label="&panel.auth.flickr.label;" 30 <command id="cmd_auth_open_flickr" label="&panel.auth.flickr.label;"
31 oncommand="fireflix.openTab('http://www.flickr.com/')" /> 31 oncommand="fireflix.openTab('http://www.flickr.com/')" />
32 <command id="cmd_auth_unauth" label="&panel.auth.unauth.label;" 32 <command id="cmd_auth_unauth" label="&panel.auth.unauth.label;"
33 oncommand="fireflix.on_cmd_auth_unauth()" /> 33 oncommand="fireflix.on_cmd_auth_unauth()" />
34 <command id="cmd_help" label="?"
35 oncommand="fireflix.openTab('chrome://fireflix/content/help.xml')" />
34 </commandset> 36 </commandset>
35 37
36 <popupset> 38 <popupset>
37 <popup id="auth_menu"> 39 <popup id="auth_menu">
38 <menuitem command="cmd_auth_auth"/> 40 <menuitem command="cmd_auth_auth"/>
39 <menuitem command="cmd_auth_done" hidden="true" id="menu_auth_done"/> 41 <menuitem command="cmd_auth_done" hidden="true" id="menu_auth_done"/>
40 <menuitem command="cmd_auth_unauth" /> 42 <menuitem command="cmd_auth_unauth" />
41 <menuseparator/> 43 <menuseparator/>
42 <menuitem command="cmd_auth_open_flickr"/> 44 <menuitem command="cmd_auth_open_flickr"/>
43 </popup> 45 </popup>
44 </popupset> 46 </popupset>
45 47
46 <commandset id="cmdset_search"> 48 <commandset id="cmdset_search">
47 <command id="cmd_search" label="&panel.search.cmd_search.label;" 49 <command id="cmd_search" label="&panel.search.cmd_search.label;"
48 oncommand="fireflix.foundphotos.search_photos()"/> 50 oncommand="fireflix.foundphotos.search_photos()"/>
49 <command id="cmd_search_open" label="&panel.search.cmd_search_open.label;" 51 <command id="cmd_search_open" label="&panel.search.cmd_search_open.label;"
50 oncommand="fireflix.foundphotos.on_cmd_open(event)" /> 52 oncommand="fireflix.foundphotos.on_cmd_open(event)" />
51 <command id="cmd_search_prev_page" 53 <command id="cmd_search_prev_page"
52 label="&panel.search.cmd_search_prev_page.label;" 54 label="&panel.search.cmd_search_prev_page.label;"
53 oncommand="fireflix.foundphotos.on_cmd_prev(event)" disabled="true"/> 55 oncommand="fireflix.foundphotos.on_cmd_prev(event)" disabled="true"/>
54 <command id="cmd_search_next_page" 56 <command id="cmd_search_next_page"
55 label="&panel.search.cmd_search_next_page.label;" 57 label="&panel.search.cmd_search_next_page.label;"
56 oncommand="fireflix.foundphotos.on_cmd_next(event)" disabled="true"/> 58 oncommand="fireflix.foundphotos.on_cmd_next(event)" disabled="true"/>
57 </commandset> 59 </commandset>
58 60
59 <commandset id="cmdset_sets"> 61 <commandset id="cmdset_sets">
60 <command id="cmd_refresh_sets" label="&panel.sets.cmd_refresh_sets;" 62 <command id="cmd_refresh_sets" label="&panel.sets.cmd_refresh_sets;"
61 oncommand="fireflix.on_refresh_sets()" /> 63 oncommand="fireflix.on_refresh_sets()" />
62 <command id="cmd_set_props" label="&panel.sets.cmd_properties;" 64 <command id="cmd_set_props" label="&panel.sets.cmd_properties;"
63 oncommand="fireflix.on_set_props()" disabled="true" /> 65 oncommand="fireflix.on_set_props()" disabled="true" />
64 </commandset> 66 </commandset>
65 67
@@ -76,64 +78,65 @@
76 <command id="cmd_uploads_clear" label="&panel.uploads.clear.label;" 78 <command id="cmd_uploads_clear" label="&panel.uploads.clear.label;"
77 oncommand="fireflix.uploads.on_clear()" /> 79 oncommand="fireflix.uploads.on_clear()" />
78 <command id="cmd_uploads_upload" label="&panel.uploads.upload.label;" 80 <command id="cmd_uploads_upload" label="&panel.uploads.upload.label;"
79 oncommand="fireflix.uploads.on_upload()" /> 81 oncommand="fireflix.uploads.on_upload()" />
80 <command id="cmd_uploads_remove" label="&panel.uploads.remove.label;" 82 <command id="cmd_uploads_remove" label="&panel.uploads.remove.label;"
81 oncommand="fireflix.uploads.on_remove()" /> 83 oncommand="fireflix.uploads.on_remove()" />
82 <command id="cmd_uploads_add" label="&panel.uploads.add.label;" 84 <command id="cmd_uploads_add" label="&panel.uploads.add.label;"
83 oncommand="fireflix.uploads.on_add()" /> 85 oncommand="fireflix.uploads.on_add()" />
84 </commandset> 86 </commandset>
85 87
86 <popupset> 88 <popupset>
87 <popup id="uploads_menu"> 89 <popup id="uploads_menu">
88 <menuitem command="cmd_uploads_add"/> 90 <menuitem command="cmd_uploads_add"/>
89 <menuitem command="cmd_uploads_clear"/> 91 <menuitem command="cmd_uploads_clear"/>
90 <menuitem command="cmd_uploads_remove"/> 92 <menuitem command="cmd_uploads_remove"/>
91 <menuseparator/> 93 <menuseparator/>
92 <menuitem command="cmd_uploads_upload"/> 94 <menuitem command="cmd_uploads_upload"/>
93 <menuseparator/> 95 <menuseparator/>
94 <menu label="&panel.uploads.generate_html;" id="uploads_html_menu"/> 96 <menu label="&panel.uploads.generate_html;" id="uploads_html_menu"/>
95 </popup> 97 </popup>
96 </popupset> 98 </popupset>
97 99
98 <vbox class="wholething" flex="1"> 100 <vbox class="wholething" flex="1">
99 101
100 <groupbox context="auth_menu"> 102 <groupbox context="auth_menu">
101 <caption label="&panel.auth_info;"/> 103 <caption label="&panel.auth_info;"/>
102 <hbox> 104 <hbox>
103 <label id="auth_info" value="&panel.no_auth_info;" flex="1" disabled="true" crop="end"/> 105 <label id="auth_info" value="&panel.no_auth_info;" flex="1" disabled="true" crop="end"/>
104 <button id="b_auth" command="cmd_auth_auth"/> 106 <button id="b_auth" command="cmd_auth_auth"/>
105 <button id="b_auth_done" command="cmd_auth_done" hidden="true"/> 107 <button id="b_auth_done" command="cmd_auth_done" hidden="true"/>
106 <button command="cmd_auth_open_flickr" 108 <button command="cmd_auth_open_flickr"
107 tooltiptext="&panel.auth.flickr.tip;"/> 109 tooltiptext="&panel.auth.flickr.tip;"/>
110 <button command="cmd_help"/>
108 </hbox> 111 </hbox>
109 </groupbox> 112 </groupbox>
110 113
111 <tabbox flex="1" id="fireflix_tabs"> 114 <tabbox flex="1" id="fireflix_tabs">
112 115
113 <tabs> 116 <tabs>
114 <tab label="&panel.tabs.search;"/> 117 <tab label="&panel.tabs.search;"/>
115 <tab label="&panel.tabs.sets;"/> 118 <tab label="&panel.tabs.sets;"/>
116 <tab label="&panel.tabs.tags;" hidden="true"/> <!-- TODO: --> 119 <tab label="&panel.tabs.tags;" hidden="true"/> <!-- TODO: -->
117 <tab id="tab_upload" label="&panel.tabs.upload;"/> 120 <tab id="tab_upload" label="&panel.tabs.upload;"/>
118 </tabs> 121 </tabs>
119 122
120 <tabpanels flex="1"> 123 <tabpanels flex="1">
121 124
122 <tabpanel id="tabpanel_search" flex="1"> 125 <tabpanel id="tabpanel_search" flex="1">
123 <vbox flex="1"> 126 <vbox flex="1">
124 <groupbox class="search_params" orient="vertical" onkeypress="if(event.keyCode==event.DOM_VK_RETURN) fireflix.foundphotos.search_photos()"> 127 <groupbox class="search_params" orient="vertical" onkeypress="if(event.keyCode==event.DOM_VK_RETURN) fireflix.foundphotos.search_photos()">
125 <hbox> 128 <hbox>
126 <label control="search_for" value="&panel.search.search_for.label;" 129 <label control="search_for" value="&panel.search.search_for.label;"
127 accesskey="s"/> 130 accesskey="s"/>
128 <textbox id="search_for" flex="1"/> 131 <textbox id="search_for" flex="1"/>
129 </hbox> 132 </hbox>
130 <hbox> 133 <hbox>
131 <checkbox id="search_tags" label="&panel.search.mode.tagsonly.label;" 134 <checkbox id="search_tags" label="&panel.search.mode.tagsonly.label;"
132 tooltiptext="&panel.search.mode.tagsonly.tip;" checked="false" 135 tooltiptext="&panel.search.mode.tagsonly.tip;" checked="false"
133 accesskey="t" /> 136 accesskey="t" />
134 <checkbox id="search_mine" label="&panel.search.mode.mine.label;" checked="true" accesskey="m"/> 137 <checkbox id="search_mine" label="&panel.search.mode.mine.label;" checked="true" accesskey="m"/>
135 <spacer flex="1"/> 138 <spacer flex="1"/>
136 <button command="cmd_search"/> 139 <button command="cmd_search"/>
137 </hbox> 140 </hbox>
138 </groupbox> 141 </groupbox>
139 <hbox> 142 <hbox>
diff --git a/content/fireflix.css b/content/fireflix.css
index 9e7bf6b..47455f6 100644
--- a/content/fireflix.css
+++ b/content/fireflix.css
@@ -68,32 +68,55 @@ image#search_photo, image#set_photo, image#set_primary {
68 68
69menuitem.menuhead { 69menuitem.menuhead {
70 background: gray; 70 background: gray;
71 color: black; 71 color: black;
72 font-weight: bold; 72 font-weight: bold;
73} 73}
74 74
75div#searchresult_description { 75div#searchresult_description {
76 min-height: 5em; max-height: 8em; 76 min-height: 5em; max-height: 8em;
77 overflow: auto; 77 overflow: auto;
78 font-size: 90%; 78 font-size: 90%;
79 margin: 0.1ex 0.5ex; 79 margin: 0.1ex 0.5ex;
80} 80}
81 81
82#copying div { 82#copying div {
83 margin: 1ex 1em; 83 margin: 1ex 1em;
84 font-family: courier, monospace; 84 font-family: courier, monospace;
85 font-size: 9pt; 85 font-size: 9pt;
86 padding: 2px; 86 padding: 2px;
87 border: dotted 1px gray; 87 border: dotted 1px gray;
88 background: white; 88 background: white;
89} 89}
90 90
91label#search_page { 91label#search_page {
92 font-weight: bold; 92 font-weight: bold;
93 background: white; color: #404040; 93 background: white; color: #404040;
94 border-color: #c0c0c0 #404040 #404040 #c0c0c0; 94 border-color: #c0c0c0 #404040 #404040 #c0c0c0;
95 border-style: solid; 95 border-style: solid;
96 border-width: 1px; 96 border-width: 1px;
97 -moz-border-radius: 1em; 97 -moz-border-radius: 1em;
98 padding: 0.5ex 1ex; 98 padding: 0.5ex 1ex;
99} 99}
100
101html body {
102 font-family: arial, sans-serif;
103 font-size: 11pt;
104 margin: 1em 4em;
105 padding: 1em 4em;
106 border: double 3px gray;
107 background: #ffffc0;
108}
109html h1 {
110 font-size: 130%; color: maroon;
111}
112html p {
113 text-align: justify;
114}
115
116html div.copyright {
117 font-size: 60%;
118 text-align: right;
119}
120html div.copyright a {
121 text-decoration: none;
122}
diff --git a/content/help.xml b/content/help.xml
new file mode 100644
index 0000000..e71cd99
--- a/dev/null
+++ b/content/help.xml
@@ -0,0 +1,53 @@
1<?xml version="1.0" encoding="utf-8"?>
2<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
3 <head>
4 <title>Fireflix</title>
5 <link rel="stylesheet" href="fireflix.css" type="text/css"/>
6 </head>
7 <body>
8
9 <p>This is a brief overview of things you can do with <a href="http://kin.klever.net/fireflix/">fireflix</a>.</p>
10
11 <p>First, you should proceed with authorization. If you haven't done it yet,
12 it should happen automatically once you open fireflix sidebar. To clear
13 authorization token off of the preferences, right-click on the 'Authorization
14 info' part of the sidebar and select 'Sign off' from the pop up menu.</p>
15
16 <h1>In the 'Search' tab</h1>
17
18 <p>Basically, you can search flickr photos here. Either all or yours (keep
19 'mine' checked to search your own photos).</p>
20
21 <p>Once you have acquired search results you can browse through them. To open
22 any particular picture in a new tab either doubleclick it or hit ENTER.</p>
23
24 <p>While moving through the list of pictures found you should have a little
25 preview at the bottom of the window.</p>
26
27 <h1>In the 'Sets' tab</h1>
28
29 <p>This is where you can browse your sets. You can edit some sets properties
30 here and, most importantly, you can generate HTML of linked thumbnails for
31 sets contents. Use your right mouse button on the photoset.</p>
32
33 <h1>In The 'Uploads' tab</h1>
34
35 <p>To upload pictures you don't even have to select this tab. Drag'n'drop into
36 fireflix sidebar should do. There is nothing wrong with going into the tab and
37 using 'Add' button either.</p>
38
39 <p>You can add photos to the list, edit their titles and/or tags and once
40 you're done with it, trigger upload procedure. Once your images have been
41 uploaded, you will be prompted to create a photoset for newly uploaded photos.
42 You don't have to, though.</p>
43
44 <h1>Feedback</h1>
45
46 <p>As the extension is at the very early stage of development, feel free to
47 provide feedback at <a href="http://kin.klever.net/fireflix/feedback" title="click here to proceed to feedback form">http://kin.klever.net/fireflix/feedback/</a>.</p>
48
49 <div class="copyright">
50 <a href="http://www.klever.net/">© Klever Group</a>
51 </div>
52 </body>
53</html>