Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

HTML: Restructure html folder

This changes the HTML part of GitX to be more consistent -- we
now use a "views" directory where every web view has it's own
directory.

Furthermore, GitX-wide Javascript is added in the "lib" directory.
The same is true for CSS in the "css" directory. Every view can
have its own custom CSS and JS, and those are put in the views
directory (without JS or CSS prefix directories).
  • Loading branch information...
commit bd097b0eff2a7099b73cb80d5a17c85f9b42a218 1 parent 4363ad1
@pieter pieter authored
View
73 GitX.xcodeproj/project.pbxproj
@@ -7,7 +7,6 @@
objects = {
/* Begin PBXBuildFile section */
- 3F0851D10EA52E4300C26EE5 /* md5.js in Resources */ = {isa = PBXBuildFile; fileRef = 3F0851CD0EA52D8E00C26EE5 /* md5.js */; };
770B37ED0679A11B001EADE2 /* GitTest_DataModel.xcdatamodel in Sources */ = {isa = PBXBuildFile; fileRef = 770B37EC0679A11B001EADE2 /* GitTest_DataModel.xcdatamodel */; };
77C8280E06725ACE000B614F /* ApplicationController.m in Sources */ = {isa = PBXBuildFile; fileRef = 77C8280C06725ACE000B614F /* ApplicationController.m */; };
8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */; };
@@ -23,7 +22,6 @@
93CB42C20EAB7B2200530609 /* PBGitDefaults.m in Sources */ = {isa = PBXBuildFile; fileRef = 93CB42C10EAB7B2200530609 /* PBGitDefaults.m */; };
93F7857F0EA3ABF100C1F443 /* PBCommitMessageView.m in Sources */ = {isa = PBXBuildFile; fileRef = 93F7857E0EA3ABF100C1F443 /* PBCommitMessageView.m */; };
D26DC6450E782C9000C777B2 /* gitx.icns in Resources */ = {isa = PBXBuildFile; fileRef = D26DC6440E782C9000C777B2 /* gitx.icns */; };
- F504F6970EAB73B300067F56 /* GitX.js in Resources */ = {isa = PBXBuildFile; fileRef = F504F6960EAB73B300067F56 /* GitX.js */; };
F50FE0E30E07BE9600854FCD /* PBGitRevisionCell.m in Sources */ = {isa = PBXBuildFile; fileRef = F50FE0E20E07BE9600854FCD /* PBGitRevisionCell.m */; };
F513085B0E0740F2000C8BCD /* PBQLOutlineView.m in Sources */ = {isa = PBXBuildFile; fileRef = F513085A0E0740F2000C8BCD /* PBQLOutlineView.m */; };
F5140DC90E8A8EB20091E9F3 /* RoundedRectangle.m in Sources */ = {isa = PBXBuildFile; fileRef = F5140DC80E8A8EB20091E9F3 /* RoundedRectangle.m */; };
@@ -33,27 +31,21 @@
F53C4DF80E97FCA70022AD59 /* PBGitBinary.m in Sources */ = {isa = PBXBuildFile; fileRef = F53C4DF60E97FC630022AD59 /* PBGitBinary.m */; };
F53C4DF90E97FCAD0022AD59 /* PBEasyPipe.m in Sources */ = {isa = PBXBuildFile; fileRef = F57CC3900E05DDF2000472E2 /* PBEasyPipe.m */; };
F53FF2050E7ABB5300389171 /* PBGitRevSpecifier.m in Sources */ = {isa = PBXBuildFile; fileRef = F53FF2040E7ABB5300389171 /* PBGitRevSpecifier.m */; };
- F561727F0E056A11001DCD79 /* diff_style.css in Resources */ = {isa = PBXBuildFile; fileRef = F561727C0E056A11001DCD79 /* diff_style.css */; };
- F56173280E056ED2001DCD79 /* diffHighlighter.js in Resources */ = {isa = PBXBuildFile; fileRef = F56173270E056ED2001DCD79 /* diffHighlighter.js */; };
F56174570E058893001DCD79 /* PBGitTree.m in Sources */ = {isa = PBXBuildFile; fileRef = F56174560E058893001DCD79 /* PBGitTree.m */; };
F561777D0E05C88E001DCD79 /* DetailView.png in Resources */ = {isa = PBXBuildFile; fileRef = F561777C0E05C88E001DCD79 /* DetailView.png */; };
- F561E6CD0E7AFDDF00521636 /* keyboardNavigation.js in Resources */ = {isa = PBXBuildFile; fileRef = F561E6CB0E7AFDD000521636 /* keyboardNavigation.js */; };
F56244090E9684B0002B6C44 /* PBUnsortableTableHeader.m in Sources */ = {isa = PBXBuildFile; fileRef = F56244080E9684B0002B6C44 /* PBUnsortableTableHeader.m */; };
F56524BB0E02D22D00F03B52 /* NSFileHandleExt.m in Sources */ = {isa = PBXBuildFile; fileRef = F56524B90E02D22D00F03B52 /* NSFileHandleExt.m */; };
F56524F00E02D45200F03B52 /* PBGitCommit.m in Sources */ = {isa = PBXBuildFile; fileRef = F56524EF0E02D45200F03B52 /* PBGitCommit.m */; };
F56526240E03D85900F03B52 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F56526230E03D85900F03B52 /* WebKit.framework */; };
F565262B0E03D89B00F03B52 /* PBWebHistoryController.m in Sources */ = {isa = PBXBuildFile; fileRef = F565262A0E03D89B00F03B52 /* PBWebHistoryController.m */; };
- F565265A0E03E71B00F03B52 /* commit.html in Resources */ = {isa = PBXBuildFile; fileRef = F56526590E03E71B00F03B52 /* commit.html */; };
F56CC7290E65E0AD004307B4 /* PBGitGraphLine.m in Sources */ = {isa = PBXBuildFile; fileRef = F56CC7280E65E0AD004307B4 /* PBGitGraphLine.m */; };
F56CC7320E65E0E5004307B4 /* PBGraphCellInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = F56CC7310E65E0E5004307B4 /* PBGraphCellInfo.m */; };
F57240BB0E9678EA00D8EE66 /* deleted_file.png in Resources */ = {isa = PBXBuildFile; fileRef = F57240BA0E9678EA00D8EE66 /* deleted_file.png */; };
F574A2910EAE2FF4003F2CB1 /* PBGitConfig.m in Sources */ = {isa = PBXBuildFile; fileRef = 93FCCBA80EA8AF450061B02B /* PBGitConfig.m */; };
- F57ABE0B0E0442DD00A088B8 /* commit.js in Resources */ = {isa = PBXBuildFile; fileRef = F57ABDDE0E0441DE00A088B8 /* commit.js */; };
F57CC3910E05DDF2000472E2 /* PBEasyPipe.m in Sources */ = {isa = PBXBuildFile; fileRef = F57CC3900E05DDF2000472E2 /* PBEasyPipe.m */; };
F57CC4410E05E496000472E2 /* PBGitWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = F57CC4400E05E496000472E2 /* PBGitWindowController.m */; };
F580E6AE0E733276009E2D3F /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F580E6AD0E733276009E2D3F /* Sparkle.framework */; };
F580E6B10E73328C009E2D3F /* Sparkle.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = F580E6AD0E733276009E2D3F /* Sparkle.framework */; };
- F58A8F280E043698007E3FC0 /* commits.css in Resources */ = {isa = PBXBuildFile; fileRef = F58A8F270E043698007E3FC0 /* commits.css */; };
F59116E60E843BB50072CCB1 /* PBGitCommitView.xib in Resources */ = {isa = PBXBuildFile; fileRef = F59116E50E843BB50072CCB1 /* PBGitCommitView.xib */; };
F59116E90E843BCB0072CCB1 /* PBGitCommitController.m in Sources */ = {isa = PBXBuildFile; fileRef = F59116E80E843BCB0072CCB1 /* PBGitCommitController.m */; };
F593DF780E9E636C003A8559 /* PBFileChangesTableView.m in Sources */ = {isa = PBXBuildFile; fileRef = F593DF770E9E636C003A8559 /* PBFileChangesTableView.m */; };
@@ -70,11 +62,8 @@
F5E926060E8827D300056E75 /* PBViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = F5E926050E8827D300056E75 /* PBViewController.m */; };
F5E927F80E883E7200056E75 /* PBChangedFile.m in Sources */ = {isa = PBXBuildFile; fileRef = F5E927F70E883E7200056E75 /* PBChangedFile.m */; };
F5E927FC0E883F0700056E75 /* PBWebChangesController.m in Sources */ = {isa = PBXBuildFile; fileRef = F5E927FB0E883F0700056E75 /* PBWebChangesController.m */; };
- F5E9281D0E8840CF00056E75 /* diff.html in Resources */ = {isa = PBXBuildFile; fileRef = F5E9281C0E8840CF00056E75 /* diff.html */; };
- F5E928550E8841FB00056E75 /* diff.js in Resources */ = {isa = PBXBuildFile; fileRef = F5E928540E8841FB00056E75 /* diff.js */; };
F5E92A1B0E88550E00056E75 /* empty_file.png in Resources */ = {isa = PBXBuildFile; fileRef = F5E92A1A0E88550E00056E75 /* empty_file.png */; };
F5E92A230E88569500056E75 /* new_file.png in Resources */ = {isa = PBXBuildFile; fileRef = F5E92A220E88569500056E75 /* new_file.png */; };
- F5EC2DAD0E8C235C000FA381 /* spinner.gif in Resources */ = {isa = PBXBuildFile; fileRef = F5EC2DAC0E8C235C000FA381 /* spinner.gif */; };
F5EF8C8E0E9D4A5D0050906B /* PBWebController.m in Sources */ = {isa = PBXBuildFile; fileRef = F5EF8C8D0E9D4A5D0050906B /* PBWebController.m */; };
F5FF4E180E0829C20006317A /* PBGitRevList.m in Sources */ = {isa = PBXBuildFile; fileRef = F5FF4E170E0829C20006317A /* PBGitRevList.m */; };
F5FF4E7A0E082E440006317A /* PBGitGrapher.m in Sources */ = {isa = PBXBuildFile; fileRef = F5FF4E790E082E440006317A /* PBGitGrapher.m */; };
@@ -110,7 +99,6 @@
29B97324FDCFA39411CA2CEA /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = "<absolute>"; };
29B97325FDCFA39411CA2CEA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; };
32CA4F630368D1EE00C91783 /* GitX_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GitX_Prefix.pch; sourceTree = "<group>"; };
- 3F0851CD0EA52D8E00C26EE5 /* md5.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; name = md5.js; path = html/md5.js; sourceTree = "<group>"; };
770B37EC0679A11B001EADE2 /* GitTest_DataModel.xcdatamodel */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = wrapper.xcdatamodel; path = GitTest_DataModel.xcdatamodel; sourceTree = "<group>"; };
77C82804067257F0000B614F /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = /System/Library/Frameworks/CoreData.framework; sourceTree = "<absolute>"; };
77C8280B06725ACE000B614F /* ApplicationController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ApplicationController.h; sourceTree = "<group>"; };
@@ -133,7 +121,6 @@
93F7857E0EA3ABF100C1F443 /* PBCommitMessageView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PBCommitMessageView.m; sourceTree = "<group>"; };
93FCCBA80EA8AF450061B02B /* PBGitConfig.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PBGitConfig.m; sourceTree = "<group>"; };
D26DC6440E782C9000C777B2 /* gitx.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = gitx.icns; sourceTree = "<group>"; };
- F504F6960EAB73B300067F56 /* GitX.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; name = GitX.js; path = html/GitX.js; sourceTree = "<group>"; };
F50FE0E10E07BE9600854FCD /* PBGitRevisionCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PBGitRevisionCell.h; sourceTree = "<group>"; };
F50FE0E20E07BE9600854FCD /* PBGitRevisionCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PBGitRevisionCell.m; sourceTree = "<group>"; };
F51308590E0740F2000C8BCD /* PBQLOutlineView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PBQLOutlineView.h; sourceTree = "<group>"; };
@@ -148,12 +135,9 @@
F53EE3590E06BBA00022B925 /* CWQuickLook.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CWQuickLook.h; sourceTree = "<group>"; };
F53FF2030E7ABB5300389171 /* PBGitRevSpecifier.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PBGitRevSpecifier.h; sourceTree = "<group>"; };
F53FF2040E7ABB5300389171 /* PBGitRevSpecifier.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PBGitRevSpecifier.m; sourceTree = "<group>"; };
- F561727C0E056A11001DCD79 /* diff_style.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.css; name = diff_style.css; path = html/diff_style.css; sourceTree = "<group>"; };
- F56173270E056ED2001DCD79 /* diffHighlighter.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; name = diffHighlighter.js; path = html/diffHighlighter.js; sourceTree = "<group>"; };
F56174550E058893001DCD79 /* PBGitTree.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PBGitTree.h; sourceTree = "<group>"; };
F56174560E058893001DCD79 /* PBGitTree.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PBGitTree.m; sourceTree = "<group>"; };
F561777C0E05C88E001DCD79 /* DetailView.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = DetailView.png; sourceTree = "<group>"; };
- F561E6CB0E7AFDD000521636 /* keyboardNavigation.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; name = keyboardNavigation.js; path = html/keyboardNavigation.js; sourceTree = "<group>"; };
F56244070E9684B0002B6C44 /* PBUnsortableTableHeader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PBUnsortableTableHeader.h; sourceTree = "<group>"; };
F56244080E9684B0002B6C44 /* PBUnsortableTableHeader.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PBUnsortableTableHeader.m; sourceTree = "<group>"; };
F56524B90E02D22D00F03B52 /* NSFileHandleExt.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NSFileHandleExt.m; sourceTree = "<group>"; };
@@ -163,19 +147,16 @@
F56526230E03D85900F03B52 /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = /System/Library/Frameworks/WebKit.framework; sourceTree = "<absolute>"; };
F56526290E03D89B00F03B52 /* PBWebHistoryController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PBWebHistoryController.h; sourceTree = "<group>"; };
F565262A0E03D89B00F03B52 /* PBWebHistoryController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PBWebHistoryController.m; sourceTree = "<group>"; };
- F56526590E03E71B00F03B52 /* commit.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; name = commit.html; path = html/commit.html; sourceTree = "<group>"; };
F56CC7270E65E0AD004307B4 /* PBGitGraphLine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PBGitGraphLine.h; sourceTree = "<group>"; };
F56CC7280E65E0AD004307B4 /* PBGitGraphLine.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PBGitGraphLine.m; sourceTree = "<group>"; };
F56CC7300E65E0E5004307B4 /* PBGraphCellInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PBGraphCellInfo.h; sourceTree = "<group>"; };
F56CC7310E65E0E5004307B4 /* PBGraphCellInfo.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PBGraphCellInfo.m; sourceTree = "<group>"; };
F57240BA0E9678EA00D8EE66 /* deleted_file.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = deleted_file.png; path = Images/deleted_file.png; sourceTree = "<group>"; };
- F57ABDDE0E0441DE00A088B8 /* commit.js */ = {isa = PBXFileReference; explicitFileType = sourcecode.javascript; fileEncoding = 4; name = commit.js; path = html/commit.js; sourceTree = "<group>"; };
F57CC38F0E05DDF2000472E2 /* PBEasyPipe.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PBEasyPipe.h; sourceTree = "<group>"; };
F57CC3900E05DDF2000472E2 /* PBEasyPipe.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PBEasyPipe.m; sourceTree = "<group>"; };
F57CC43F0E05E496000472E2 /* PBGitWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PBGitWindowController.h; sourceTree = "<group>"; };
F57CC4400E05E496000472E2 /* PBGitWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PBGitWindowController.m; sourceTree = "<group>"; };
F580E6AD0E733276009E2D3F /* Sparkle.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Sparkle.framework; sourceTree = "<group>"; };
- F58A8F270E043698007E3FC0 /* commits.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.css; name = commits.css; path = html/commits.css; sourceTree = "<group>"; };
F59116E50E843BB50072CCB1 /* PBGitCommitView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = PBGitCommitView.xib; sourceTree = "<group>"; };
F59116E70E843BCB0072CCB1 /* PBGitCommitController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PBGitCommitController.h; sourceTree = "<group>"; };
F59116E80E843BCB0072CCB1 /* PBGitCommitController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PBGitCommitController.m; sourceTree = "<group>"; };
@@ -191,6 +172,7 @@
F5C6F68B0E65FF9300478D97 /* PBGitLane.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PBGitLane.h; sourceTree = "<group>"; };
F5C6F68C0E65FF9300478D97 /* PBGitLane.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PBGitLane.m; sourceTree = "<group>"; };
F5D2DC850EA401A80034AD24 /* PBGitConfig.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PBGitConfig.h; sourceTree = "<group>"; };
+ F5D619ED0EAE62EA00341D73 /* html */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = folder; path = html; sourceTree = "<group>"; };
F5DFFA6A0E075D8800617813 /* PBEasyFS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PBEasyFS.h; sourceTree = "<group>"; };
F5DFFA6B0E075D8800617813 /* PBEasyFS.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PBEasyFS.m; sourceTree = "<group>"; };
F5E424100EA3E4D60046E362 /* PBDiffWindow.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = PBDiffWindow.xib; sourceTree = "<group>"; };
@@ -205,11 +187,8 @@
F5E927F70E883E7200056E75 /* PBChangedFile.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PBChangedFile.m; sourceTree = "<group>"; };
F5E927FA0E883F0700056E75 /* PBWebChangesController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PBWebChangesController.h; sourceTree = "<group>"; };
F5E927FB0E883F0700056E75 /* PBWebChangesController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PBWebChangesController.m; sourceTree = "<group>"; };
- F5E9281C0E8840CF00056E75 /* diff.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; name = diff.html; path = html/diff.html; sourceTree = "<group>"; };
- F5E928540E8841FB00056E75 /* diff.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; name = diff.js; path = html/diff.js; sourceTree = "<group>"; };
F5E92A1A0E88550E00056E75 /* empty_file.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = empty_file.png; path = Images/empty_file.png; sourceTree = "<group>"; };
F5E92A220E88569500056E75 /* new_file.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = new_file.png; path = Images/new_file.png; sourceTree = "<group>"; };
- F5EC2DAC0E8C235C000FA381 /* spinner.gif */ = {isa = PBXFileReference; lastKnownFileType = image.gif; name = spinner.gif; path = Images/spinner.gif; sourceTree = "<group>"; };
F5EF8C8C0E9D4A5D0050906B /* PBWebController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PBWebController.h; sourceTree = "<group>"; };
F5EF8C8D0E9D4A5D0050906B /* PBWebController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PBWebController.m; sourceTree = "<group>"; };
F5FF4E160E0829C20006317A /* PBGitRevList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PBGitRevList.h; sourceTree = "<group>"; };
@@ -287,7 +266,7 @@
F57CC3850E05DDC1000472E2 /* Controllers */,
F561777C0E05C88E001DCD79 /* DetailView.png */,
F56174540E05887E001DCD79 /* Git */,
- F58A8F250E04368A007E3FC0 /* HTML */,
+ F5D619ED0EAE62EA00341D73 /* html */,
7756732906782D8800D1FEB8 /* Models */,
080E96DDFE201D6D7F000001 /* Classes */,
29B97315FDCFA39411CA2CEA /* Other Sources */,
@@ -302,7 +281,6 @@
isa = PBXGroup;
children = (
F57240BA0E9678EA00D8EE66 /* deleted_file.png */,
- F5EC2DAC0E8C235C000FA381 /* spinner.gif */,
F5E92A1A0E88550E00056E75 /* empty_file.png */,
32CA4F630368D1EE00C91783 /* GitX_Prefix.pch */,
29B97316FDCFA39411CA2CEA /* main.m */,
@@ -413,23 +391,6 @@
name = Aux;
sourceTree = "<group>";
};
- F58A8F250E04368A007E3FC0 /* HTML */ = {
- isa = PBXGroup;
- children = (
- F504F6960EAB73B300067F56 /* GitX.js */,
- 3F0851CD0EA52D8E00C26EE5 /* md5.js */,
- F5E928540E8841FB00056E75 /* diff.js */,
- F56526590E03E71B00F03B52 /* commit.html */,
- F5E9281C0E8840CF00056E75 /* diff.html */,
- F561727C0E056A11001DCD79 /* diff_style.css */,
- F561E6CB0E7AFDD000521636 /* keyboardNavigation.js */,
- F58A8F270E043698007E3FC0 /* commits.css */,
- F57ABDDE0E0441DE00A088B8 /* commit.js */,
- F56173270E056ED2001DCD79 /* diffHighlighter.js */,
- );
- name = HTML;
- sourceTree = "<group>";
- };
F5B161BB0EAB6E0C005A1DE1 /* Diff */ = {
isa = PBXGroup;
children = (
@@ -531,6 +492,7 @@
8D11072C0486CEB800E47090 /* Sources */,
8D11072E0486CEB800E47090 /* Frameworks */,
F580E6BD0E73329C009E2D3F /* CopyFiles */,
+ F5CF04A20EAE696C00D75C81 /* Copy HTML files */,
);
buildRules = (
);
@@ -582,27 +544,16 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
- F5E928550E8841FB00056E75 /* diff.js in Resources */,
- F504F6970EAB73B300067F56 /* GitX.js in Resources */,
- 3F0851D10EA52E4300C26EE5 /* md5.js in Resources */,
- F561E6CD0E7AFDDF00521636 /* keyboardNavigation.js in Resources */,
F5E92A1B0E88550E00056E75 /* empty_file.png in Resources */,
913D5E500E55645900CECEA2 /* gitx in Resources */,
8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */,
- F565265A0E03E71B00F03B52 /* commit.html in Resources */,
- F56173280E056ED2001DCD79 /* diffHighlighter.js in Resources */,
- F561727F0E056A11001DCD79 /* diff_style.css in Resources */,
- F57ABE0B0E0442DD00A088B8 /* commit.js in Resources */,
- F58A8F280E043698007E3FC0 /* commits.css in Resources */,
F561777D0E05C88E001DCD79 /* DetailView.png in Resources */,
F5B721C40E05CF7E00AF29DC /* MainMenu.xib in Resources */,
911111E20E58BD5A00BF76B4 /* RepositoryWindow.xib in Resources */,
D26DC6450E782C9000C777B2 /* gitx.icns in Resources */,
F52BCE030E84208300AA3741 /* PBGitHistoryView.xib in Resources */,
F59116E60E843BB50072CCB1 /* PBGitCommitView.xib in Resources */,
- F5E9281D0E8840CF00056E75 /* diff.html in Resources */,
F5E92A230E88569500056E75 /* new_file.png in Resources */,
- F5EC2DAD0E8C235C000FA381 /* spinner.gif in Resources */,
F57240BB0E9678EA00D8EE66 /* deleted_file.png in Resources */,
F5E424110EA3E4D60046E362 /* PBDiffWindow.xib in Resources */,
);
@@ -610,6 +561,24 @@
};
/* End PBXResourcesBuildPhase section */
+/* Begin PBXShellScriptBuildPhase section */
+ F5CF04A20EAE696C00D75C81 /* Copy HTML files */ = {
+ isa = PBXShellScriptBuildPhase;
+ buildActionMask = 2147483647;
+ comments = "This is added as a script rather than a 'copy files' phase because those aren't updated correctly when you edit just a single file in a directory.\n\nThis might be improved further by using rsync, but I didn't dive into that yet.";
+ files = (
+ );
+ inputPaths = (
+ );
+ name = "Copy HTML files";
+ outputPaths = (
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ shellPath = /bin/sh;
+ shellScript = "resource_path=$TARGET_BUILD_DIR/$UNLOCALIZED_RESOURCES_FOLDER_PATH\nrm -rf $resource_path/html\ncp -r html $resource_path";
+ };
+/* End PBXShellScriptBuildPhase section */
+
/* Begin PBXSourcesBuildPhase section */
8D11072C0486CEB800E47090 /* Sources */ = {
isa = PBXSourcesBuildPhase;
View
2  PBWebChangesController.m
@@ -12,7 +12,7 @@ @implementation PBWebChangesController
- (void) awakeFromNib
{
- startFile = @"diff";
+ startFile = @"commit";
[super awakeFromNib];
[unstagedFilesController addObserver:self forKeyPath:@"selection" options:0 context:@"UnstagedFileSelected"];
View
4 PBWebController.m
@@ -15,7 +15,9 @@ @implementation PBWebController
- (void) awakeFromNib
{
- NSString* file = [[NSBundle mainBundle] pathForResource:startFile ofType:@"html"];
+ NSString *path = [NSString stringWithFormat:@"html/views/%@", startFile];
+ NSString* file = [[NSBundle mainBundle] pathForResource:@"index" ofType:@"html" inDirectory:path];
+ NSLog(@"path: %@, file: %@", path, file);
NSURLRequest * request = [NSURLRequest requestWithURL:[NSURL fileURLWithPath:file]];
finishedLoading = NO;
View
2  PBWebDiffController.m
@@ -13,7 +13,7 @@ @implementation PBWebDiffController
- (void) awakeFromNib
{
- startFile = @"simpleDiff";
+ startFile = @"diff";
[super awakeFromNib];
[diffController addObserver:self forKeyPath:@"diff" options:0 context:@"ChangedDiff"];
}
View
2  PBWebHistoryController.m
@@ -24,7 +24,7 @@ @implementation PBWebHistoryController
- (void) awakeFromNib
{
- startFile = @"commit";
+ startFile = @"history";
[super awakeFromNib];
[historyController addObserver:self forKeyPath:@"webCommit" options:0 context:@"ChangedCommit"];
}
View
1  html/css/GitX.css
@@ -0,0 +1 @@
+@import url("diff.css");
View
7 html/diff_style.css → html/css/diff.css
@@ -29,13 +29,6 @@ pre code {
width: 100%;
}
-#message {
- margin: 5px;
- margin-left: 20px;
- font-family: Monaco;
- width: auto;
-}
-
#CurrentHunk {
border-left: 5px solid black;
}
View
63 html/diff.html
@@ -1,63 +0,0 @@
-<html>
-<head>
- <title>Diff for file</title>
- <link rel="stylesheet" href="commits.css" type="text/css" media="screen" title="no title" charset="utf-8">
- <link rel="stylesheet" href="diff_style.css" type="text/css" media="screen" title="no title" charset="utf-8">
-
- <script src="GitX.js" type="text/javascript" charset="utf-8"></script>
- <script src="diff.js" type="text/javascript" charset="utf-8"></script>
- <script>
- var showFileChanges = function(file, cached) {
- // New file?
- var diff = $("diff");
-
- if (file.status == 0)
- {
- var contents = file.unstagedChanges();
- if (contents)
- diff.innerHTML = contents.escapeHTML();
- else
- diff.innerHTML = "Could not display changes";
-
- diff.style.display= '';
- $('title').innerHTML = "New file: " + file.path;
- } else {
- diff.style.display = 'none';
- if (cached)
- diff.innerHTML = file.cachedChangesAmend_(Controller.amend()).escapeHTML();
- else
- diff.innerHTML = file.unstagedChanges().escapeHTML();
- highlightDiffs();
- diff.style.display = '';
- $("title").innerHTML = "Changes for " + file.path;
- }
- }
- </script>
- <style type="text/css" media="screen">
- body {
- padding: 0px;
- margin: 0px;
- margin-top: 20px;
- }
- #title {
- padding: 0px;
- padding-left: 5px;
- border-bottom: 1px solid black;
- margin: 0px;
- font-weight: 500;
- background-color: #ECF3FD;
- font-size: 100%;
- position: fixed;
- font-family: Helvetica;
- top: 0px;
- width: 100%;
- }
- </style>
- <script src="diffHighlighter.js" type="text/javascript" charset="utf-8"></script>
- <script src="keyboardNavigation.js" type="text/javascript" charset="utf-8"></script>
-
-</head>
-<h1 id='title'>Nothing to commit</h1>
-<body style="padding: 0px; border: 0px" onLoad="">
- <pre><code class="diffcode" id='diff'>Nothing to commit (working directory clean)</code></pre>
-</body>
View
0  html/diff.js
No changes.
View
0  Images/spinner.gif → html/images/spinner.gif
File renamed without changes
View
21 html/GitX.js → html/lib/GitX.js
@@ -24,4 +24,23 @@ Array.prototype.indexOf = function(item, i) {
for (; i < length; i++)
if (this[i] === item) return i;
return -1;
-};
+};
+
+var notify = function(text, state) {
+ var n = $("notification");
+ n.style.display = "";
+ $("notification_message").innerHTML = text;
+
+ // Change color
+ if (!state) { // Busy
+ $("spinner").style.display = "";
+ n.setAttribute("class", "");
+ }
+ else if (state == 1) { // Success
+ $("spinner").style.display = "none";
+ n.setAttribute("class", "success");
+ } else if (state == -1) {// Fail
+ $("spinner").style.display = "none";
+ n.setAttribute("class", "fail");
+ }
+}
View
0  html/diffHighlighter.js → html/lib/diffHighlighter.js
File renamed without changes
View
0  html/keyboardNavigation.js → html/lib/keyboardNavigation.js
File renamed without changes
View
0  html/md5.js → html/lib/md5.js
File renamed without changes
View
19 html/simpleDiff.html
@@ -1,19 +0,0 @@
-<html>
-<head>
- <title>Details for commit</title>
- <link rel="stylesheet" href="commits.css" type="text/css" media="screen" title="no title" charset="utf-8">
- <link rel="stylesheet" href="diff_style.css" type="text/css" media="screen" title="no title" charset="utf-8">
- <script src="prototype.js" type="text/javascript" charset="utf-8"></script>
- <script src="diffHighlighter.js" type="text/javascript" charset="utf-8"></script>
- <script type="text/javascript" charset="utf-8">
-
- var showDiff = function(diff) {
- document.getElementById("details").innerHTML = diff.escapeHTML();
- highlightDiffs();
- }
- </script>
-</head>
-
-<body style="padding: 0px; border: 0px">
- <pre><code class="diffcode" id='details'></code></pre>
-</body>
View
19 html/views/commit/commit.css
@@ -0,0 +1,19 @@
+body {
+ padding: 0px;
+ margin: 0px;
+ margin-top: 20px;
+}
+
+#title {
+ padding: 0px;
+ padding-left: 5px;
+ border-bottom: 1px solid black;
+ margin: 0px;
+ font-weight: 500;
+ background-color: #ECF3FD;
+ font-size: 100%;
+ position: fixed;
+ font-family: Helvetica;
+ top: 0px;
+ width: 100%;
+}
View
25 html/views/commit/commit.js
@@ -0,0 +1,25 @@
+var showFileChanges = function(file, cached) {
+ // New file?
+ var diff = $("diff");
+
+ if (file.status == 0)
+ {
+ var contents = file.unstagedChanges();
+ if (contents)
+ diff.innerHTML = contents.escapeHTML();
+ else
+ diff.innerHTML = "Could not display changes";
+
+ diff.style.display= '';
+ $('title').innerHTML = "New file: " + file.path;
+ } else {
+ diff.style.display = 'none';
+ if (cached)
+ diff.innerHTML = file.cachedChangesAmend_(Controller.amend()).escapeHTML();
+ else
+ diff.innerHTML = file.unstagedChanges().escapeHTML();
+ highlightDiffs();
+ diff.style.display = '';
+ $("title").innerHTML = "Changes for " + file.path;
+ }
+}
View
27 html/views/commit/index.html
@@ -0,0 +1,27 @@
+<html>
+<head>
+ <title>Diff for file</title>
+ <link rel="stylesheet" href="../../css/GitX.css" type="text/css" media="screen" title="no title" charset="utf-8">
+ <script src="../../lib/GitX.js" type="text/javascript" charset="utf-8"></script>
+ <script src="../../lib/md5.js" type="text/javascript" charset="utf-8"></script>
+ <script src="../../lib/diffHighlighter.js" type="text/javascript" charset="utf-8"></script>
+ <script src="../../lib/keyboardNavigation.js" type="text/javascript" charset="utf-8"></script>
+
+ <link rel="stylesheet" href="commit.css" type="text/css" media="screen" title="no title" charset="utf-8">
+ <script src="commit.js" type="text/javascript" chahrset="utf-8"></script>
+</head>
+
+<body>
+ <h1 id='title'>Nothing to commit</h1>
+
+ <div id="notification" style="display:none;">
+ <img src="../../images/spinner.gif" alt="Spinner" id="spinner"></img>
+ <div id="notification_message"></div>
+ </div>
+
+ <pre>
+ <code class="diffcode" id='diff'>
+ Nothing to commit (working directory clean)
+ </code>
+ </pre>
+</body>
View
21 html/views/diff/index.html
@@ -0,0 +1,21 @@
+<html>
+<head>
+ <title>Details for commit</title>
+ <link rel="stylesheet" href="../../css/GitX.css" type="text/css" media="screen" title="no title" charset="utf-8">
+ <script src="../../lib/GitX.js" type="text/javascript" charset="utf-8"></script>
+ <script src="../../lib/md5.js" type="text/javascript" charset="utf-8"></script>
+ <script src="../../lib/diffHighlighter.js" type="text/javascript" charset="utf-8"></script>
+ <script src="../../lib/keyboardNavigation.js" type="text/javascript" charset="utf-8"></script>
+
+ <script type="text/javascript" charset="utf-8">
+ var showDiff = function(diff) {
+ document.getElementById("details").innerHTML = diff.escapeHTML();
+ highlightDiffs();
+ }
+ </script>
+</head>
+
+<body>
+ <pre><code class="diffcode" id='details'>
+ </code></pre>
+</body>
View
6 html/commits.css → html/views/history/history.css
@@ -79,8 +79,10 @@ a.servicebutton{
}
#message {
- font-family: Helvetica;
- margin-left: 0px;
+ font-family: Monaco;
+ margin: 5px;
+ margin-left: 20px;
+ width: auto;
font-size: 12px;
}
View
19 html/commit.js → html/views/history/history.js
@@ -37,25 +37,6 @@ var Commit = function(obj) {
}
};
-var notify = function(text, state) {
- var n = $("notification");
- n.style.display = "";
- $("notification_message").innerHTML = text;
-
- // Change color
- if (!state) { // Busy
- $("spinner").style.display = "";
- n.setAttribute("class", "");
- }
- else if (state == 1) { // Success
- $("spinner").style.display = "none";
- n.setAttribute("class", "success");
- } else if (state == -1) {// Fail
- $("spinner").style.display = "none";
- n.setAttribute("class", "fail");
- }
-}
-
var gistie = function() {
notify("Uploading code to Gistie..", 0);
View
17 html/commit.html → html/views/history/index.html
@@ -1,13 +1,14 @@
<html>
<head>
<title>Details for commit</title>
- <link rel="stylesheet" href="commits.css" type="text/css" media="screen" title="no title" charset="utf-8">
- <link rel="stylesheet" href="diff_style.css" type="text/css" media="screen" title="no title" charset="utf-8">
- <script src="GitX.js" type="text/javascript" charset="utf-8"></script>
- <script src="md5.js" type="text/javascript" charset="utf-8"></script>
- <script src="commit.js" type="text/javascript" charset="utf-8"></script>
- <script src="diffHighlighter.js" type="text/javascript" charset="utf-8"></script>
- <script src="keyboardNavigation.js" type="text/javascript" charset="utf-8"></script>
+ <link rel="stylesheet" href="../../css/GitX.css" type="text/css" media="screen" title="no title" charset="utf-8">
+ <script src="../../lib/GitX.js" type="text/javascript" charset="utf-8"></script>
+ <script src="../../lib/md5.js" type="text/javascript" charset="utf-8"></script>
+ <script src="../../lib/diffHighlighter.js" type="text/javascript" charset="utf-8"></script>
+ <script src="../../lib/keyboardNavigation.js" type="text/javascript" charset="utf-8"></script>
+
+ <link rel="stylesheet" href="history.css" type="text/css" media="screen" title="no title" charset="utf-8">
+ <script src="history.js" type="text/javascript" charset="utf-8"></script>
</head>
<body style="padding: 0px; border: 0px">
@@ -42,7 +43,7 @@
</tr>
</table>
<div id="notification" style="display:none;">
- <img src="spinner.gif" alt="Spinner" id="spinner"></img>
+ <img src="../../images/spinner.gif" alt="Spinner" id="spinner"></img>
<div id="notification_message"></div>
</div>
<hr>
Please sign in to comment.
Something went wrong with that request. Please try again.