Permalink
Browse files

Merge branch 'master' of github.com:bitboxer/chrome-passwordmaker

  • Loading branch information...
bitboxer committed Nov 21, 2011
2 parents c4ce028 + 9e0ec13 commit 5002b77cc708bce867ac6bc46c326acf07bd8543
Showing with 322 additions and 101 deletions.
  1. +21 −0 css/options.css
  2. +45 −7 html/options.html
  3. +183 −82 javascript/import.js
  4. +11 −1 javascript/options.js
  5. +62 −5 test/import.js
  6. +0 −6 test/index.html
View
@@ -75,6 +75,10 @@ h2 {
margin-top: 20px;
}
#showExport {
margin-top: 20px;
}
#list h2 {
padding-top: 0px;
margin-top: 0px;
@@ -104,11 +108,23 @@ h2 {
padding-left: 2px;
}
#export_settings {
padding: 5px;
width: 505px;
float: right;
display: none;
}
#importText {
width: 505px;
height: 150px;
}
#exportText {
width: 505px;
height: 150px;
}
#profile_setting h2 {
padding-top: 0px;
margin-top: 0px;
@@ -133,6 +149,11 @@ h2 {
text-align: right;
}
#export_buttons {
width: 505px;
text-align: right;
}
.row {
margin-bottom: 5px;
}
View
@@ -32,6 +32,9 @@ <h2>Profiles</h2>
<div id="showImport">
<a href="#" onClick="showImport();" class="awesome button">Import Profiles</a>
</div>
<div id="showExport">
<a href="#" onClick="showExport();" class="awesome button">Export Profiles</a>
</div>
<div id="showSettings">
<a href="#" onClick="showOptions();" class="awesome button">General Options</a>
</div>
@@ -178,21 +181,56 @@ <h2>Profiles</h2>
<div id="import_settings">
<div id="form">
<h2>Import Firefox Profiles</h2>
<h2>Import Profiles</h2>
<div class="row">
<p class="import_help">
<em>
In Firefox PasswordMaker go to <a
href="http://passwordmaker.org/Firefox/Mozilla/SeaMonkey/Flock/Netscape/Advanced">Advanced Options</a> &rarr; File &rarr; Export Settings.
Choose RDF as the export type. Edit the .rdf file
in a plain text editor (e.g. notepad) then select
all, copy, and paste into the box below.
Paste export into the box below then click "Import".
</em>
</p>
<p class="import_help">
<em>
From Firefox PasswordMaker go to <a href="http://passwordmaker.org/Firefox/Mozilla/SeaMonkey/Flock/Netscape/Advanced">Advanced Options</a>
&rarr; File &rarr; Export Settings &rarr; RDF. Open the .rdf file
in a plain text editor (e.g. notepad) then select all, copy
and paste into the box below.
</em>
</p>
<textarea id="importText"></textarea>
</div>
<div id="import_buttons">
<a href="#" onClick="importRdf();" class="awesome button">Import RDF</a>
<a href="#" onClick="importRdf();" class="awesome button">Import</a>
</div>
</div>
</div>
<div id="export_settings">
<div id="form">
<h2>Export Profiles</h2>
<div class="row">
<p class="export_help">
<em>
Copy and paste the text below into "Import Profiles" section of Chrome PasswordMaker Pro.
</em>
</p>
<p class="export_help">
<em>
For Firefox PasswordMaker, save
the text below into a plain text document (e.g.
open notepad, paste, save as "profiles.rdf") then
go to
<a
href="http://passwordmaker.org/Firefox/Mozilla/SeaMonkey/Flock/Netscape/Advanced">Advanced Options</a> &rarr; File &rarr; Import Settings.
<strong>
Back up any existing settings first by going to
Firefox PasswordMaker &rarr; File &rarr; Export
Setting &rarr; RDF.</strong>
</em>
</p>
<textarea id="exportText"></textarea>
</div>
<div id="export_buttons">
<a href="#" onClick="copyRdfExport();" class="awesome button">Copy</a>
</div>
</div>
</div>
Oops, something went wrong.

0 comments on commit 5002b77

Please sign in to comment.