Menu
▾
▴
[Bibdesk-commit] SF.net SVN: bibdesk:[15586] trunk/bibdesk
|
From: <ss...@us...> - 2009-07-26 18:03:38
|
Revision: 15586
http://bibdesk.svn.sourceforge.net/bibdesk/?rev=15586&view=rev
Author: ssssssp
Date: 2009-07-26 18:03:31 +0000 (Sun, 26 Jul 2009)
Log Message:
-----------
Facelift for the Web Group start page.
Links to sites are now easier to locate and have larger clickable areas.
French localisation of the WebGroupStartPage.html file is still needed.
Modified Paths:
--------------
trunk/bibdesk/BDSKBibDeskProtocol.m
trunk/bibdesk/English.lproj/WebGroupStartPage.html
Modified: trunk/bibdesk/BDSKBibDeskProtocol.m
===================================================================
--- trunk/bibdesk/BDSKBibDeskProtocol.m 2009-07-26 04:58:53 UTC (rev 15585)
+++ trunk/bibdesk/BDSKBibDeskProtocol.m 2009-07-26 18:03:31 UTC (rev 15586)
@@ -103,7 +103,7 @@
- (NSData *) welcomeHTMLData {
NSError * error;
NSString * baseStringPath = [[NSBundle mainBundle] pathForResource:@"WebGroupStartPage" ofType:@"html"];
- NSString * baseString = [NSString stringWithContentsOfFile:baseStringPath encoding:NSUTF8StringEncoding error:&error];
+ NSMutableString * baseString = [NSMutableString stringWithContentsOfFile:baseStringPath encoding:NSUTF8StringEncoding error:&error];
if (!baseString) return nil;
NSMutableArray * parserFeatures = [NSMutableArray array];
@@ -141,12 +141,13 @@
}
NSString * publicFeatureMarkup = [self markupForSiteArray:publicFeatures];
+ [baseString replaceOccurrencesOfString:@"PUBLICLIST" withString:publicFeatureMarkup options:NSLiteralSearch range:NSMakeRange(0, [baseString length])];
NSString * subscriptionFeatureMarkup = [self markupForSiteArray:subscriptionFeatures];
+ [baseString replaceOccurrencesOfString:@"SUBSCRIPTIONLIST" withString:subscriptionFeatureMarkup options:NSLiteralSearch range:NSMakeRange(0, [baseString length])];
NSString * generalFeatureMarkup = [self markupForSiteArray:generalFeatures];
+ [baseString replaceOccurrencesOfString:@"GENERALLIST" withString:generalFeatureMarkup options:NSLiteralSearch range:NSMakeRange(0, [baseString length])];
- NSString * result = [NSString stringWithFormat:baseString, publicFeatureMarkup, subscriptionFeatureMarkup, generalFeatureMarkup];
- NSData * data = [result dataUsingEncoding:NSUTF8StringEncoding];
-
+ NSData * data = [baseString dataUsingEncoding:NSUTF8StringEncoding];
return data;
}
@@ -160,6 +161,7 @@
NSEnumerator * myEnum = [siteArray objectEnumerator];
NSMutableArray * linkStrings = [NSMutableArray arrayWithCapacity:[siteArray count] * 2];
NSDictionary * siteInfo;
+ NSXMLElement * ulElement = [NSXMLElement elementWithName:@"ul"];
while (siteInfo = [myEnum nextObject]) {
NSXMLElement * aElement = [NSXMLElement elementWithName:@"a" stringValue:[siteInfo objectForKey:NAME_KEY]];
@@ -173,11 +175,13 @@
NSXMLNode * titleNode = [NSXMLNode attributeWithName:@"title" stringValue:titleString];
[aElement addAttribute:titleNode];
}
-
- [linkStrings addObject:[aElement XMLString]];
+
+ NSXMLElement * liElement = [NSXMLElement elementWithName:@"li"];
+ [liElement addChild:aElement];
+ [ulElement addChild:liElement];
}
- NSString * result = [[linkStrings componentsJoinedByString:@", "] stringByAppendingString:@"."];
+ NSString * result = [ulElement XMLString];
return result;
}
Modified: trunk/bibdesk/English.lproj/WebGroupStartPage.html
===================================================================
--- trunk/bibdesk/English.lproj/WebGroupStartPage.html 2009-07-26 04:58:53 UTC (rev 15585)
+++ trunk/bibdesk/English.lproj/WebGroupStartPage.html 2009-07-26 18:03:31 UTC (rev 15586)
@@ -6,10 +6,19 @@
<style type="text/css">
* { margin: 0px; padding: 0px; }
body { font-family: "Lucida Grande"; font-size: 13px; padding: 1em; }
- h1 { font-size: 16px; }
- h2 { font-size: 13px; }
- div.group { margin: 1em 0em 0em 1em; text-indent: -1em; }
- p, h1, h2 { display: inline; }
+ h1 { font-size: 16px; display:none; }
+ p, .columns { max-width:50em; margin:auto;}
+ .columns { margin-top:1em; position: relative;}
+ .column { width:33%; float:left; display:block; }
+ .column.c1>* { margin-right: .66em; }
+ .column.c2>* { margin: 0em 0.33em; }
+ .column.c3>* { margin-left: .66em; }
+ .column h2 { font-size: 13px; background: #ccc; padding: 0.5em 0.66em;}
+ .column ul { background: #eee; border: 1px solid #ccc; list-style-type: none; line-height: 1.66em;}
+ .column ul a {display:block; padding: 0em 0.66em;}
+ .column ul li:first-child a {padding-top: 0.5em;}
+ .column ul li:last-child a {padding-bottom: 0.5em;}
+ .column p { padding: 0.5em 0.66em; margin-top: 0.5em;}
a { text-decoration: none; }
a:hover { text-decoration: underline; }
a:active { color: #900; }
@@ -18,31 +27,30 @@
</head>
<body>
- <div class="group">
- <h1>Web Group:</h1>
- <p>
- BibDesk attempts to recognise bibliographic information on web pages and to process them for easy searching and one-click import.
- </p>
- </div>
+ <h1>Web Group</h1>
+ <p>
+ BibDesk recognises bibliographic information on some web pages and processes them for easy searching and single-click import. Supported sites and formats are:
+ </p>
- <div class="group">
- <h2>Supported sites without access restrictions:</h2>
- <p>%@</p>
+ <div class="columns">
+ <div class="column c1">
+ <h2 title="These sites are fully accessible for anyone.">Free Sites</h2>
+ PUBLICLIST
</div>
- <div class="group">
- <h2>Sites which require subscriptions to be fully supported or to be accessed:</h2>
- <p>%@</p>
+ <div class="column c2">
+ <h2 title="These sites require a subscription by you or your institution to access their full content. A subset of the content may be available to everybody.">Subscription Sites</h2>
+ SUBSCRIPTIONLIST
</div>
- <div class="group">
- <h2>General formats which BibDesk tries to recognise on all pages:</h2>
- <p>%@</p>
+ <div class="column c3">
+ <h2 title="Formats which can be embedded in web pages and extracted from there.">General formats</h2>
+ GENERALLIST
+
+ <p>
+ Please refer to the <a href="help:anchor=Web-Group">Web Group Help page</a> for further information on the supported sites and formats.
+ </p>
</div>
-
- <div class="group">
- Please read the <a href="help:anchor=Web-Group">Web Group Help page</a> for further information on the supported sites and formats.
</div>
-
</body>
</html>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|